ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 10 ++++++
vcl/ios/iosinst.cxx | 6 ++--
vcl/quartz/salgdi.cxx | 15
++++++++++
3 files changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 0f5a7bc99fff074336b8d122a0bcc8f3c8e79a7f
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Dec 11 18:16:58 2013 +0200
Add a file
Change-Id: I32bc4852396b0eff9962dc5cd007faf0bb9f5eaa
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 3c5be84..858beb7 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -267,6 +267,7 @@
BE82BE4B1822D10F00A447B5 /* ctfonts.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctfonts.cxx;
path = ../../vcl/quartz/ctfonts.cxx; sourceTree = "<group>"; };
BE82BE4D1822D10F00A447B5 /* ctlayout.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctlayout.cxx;
path = ../../vcl/quartz/ctlayout.cxx; sourceTree = "<group>"; };
BE82BE4E1822D10F00A447B5 /* salgdi.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdi.cxx;
path = ../../vcl/quartz/salgdi.cxx; sourceTree = "<group>"; };
+ BEC9DABC1858BA39009CCCB3 /* svdpagv.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svdpagv.cxx;
path = ../../svx/source/svdraw/svdpagv.cxx; sourceTree = "<group>"; };
BEE68B5D185715EE0049ECE0 /* salbmp.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salbmp.cxx;
path = ../../vcl/quartz/salbmp.cxx; sourceTree = "<group>"; };
BEE68B5E185715EE0049ECE0 /* salgdicommon.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
salgdicommon.cxx; path = ../../vcl/quartz/salgdicommon.cxx; sourceTree =
"<group>"; };
BEE68B5F185715EE0049ECE0 /* salgdiutils.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
salgdiutils.cxx; path = ../../vcl/quartz/salgdiutils.cxx; sourceTree =
"<group>"; };
@@ -484,6 +485,7 @@
isa = PBXGroup;
children = (
BEE68B62185746D20049ECE0 /* basebmp */,
+ BEC9DABA1858B9DB009CCCB3 /* svx */,
BE82BDB61822617C00A447B5 /* sw */,
BE82BDB51822617500A447B5 /* vcl */,
);
@@ -703,6 +705,14 @@
name = quartz;
sourceTree = "<group>";
};
+ BEC9DABA1858B9DB009CCCB3 /* svx */ = {
+ isa = PBXGroup;
+ children = (
+ BEC9DABC1858BA39009CCCB3 /* svdpagv.cxx */,
+ );
+ name = svx;
+ sourceTree = "<group>";
+ };
BEE68B62185746D20049ECE0 /* basebmp */ = {
isa = PBXGroup;
children = (
commit 69baf700b6ac9c069022714c3d661a632ade93a3
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Dec 11 18:11:22 2013 +0200
Try to fix colour issues
Use RGBA consistenly. Wonder why the code was changed to use BGRA at
some point?
I got the picture in the document to show up with correct colours but
unfortunately not the RED GREEN BLUE etc text. Weird. Even weirder, if
I add a temporary hack in CoreTextStyle::SetTextColor() to use some
other colours for non-black text (instead of the ones passed in the
parameter), those colours do show up. This is a mystery.
Change-Id: I591424a19fa02b3f095035e989cbc49fff94b8ca
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index c0f7073..0b3f69f 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -156,7 +156,7 @@ public:
sal_uLong nSalFrameStyle,
SystemParentData *pSysParent )
: SvpSalFrame( pInstance, pParent, nSalFrameStyle,
- true, basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA,
+ true, basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA,
pSysParent )
{
enableDamageTracker();
@@ -361,7 +361,7 @@ IMPL_LINK( IosSalInstance, RenderWindows,
RenderWindowsArg*, arg )
CGImageCreate( aDevice->getSize().getX(),
aDevice->getSize().getY(),
8, 32, aDevice->getScanlineStride(),
CGColorSpaceCreateDeviceRGB(),
- kCGImageAlphaNoneSkipFirst |
kCGBitmapByteOrder32Little,
+ kCGImageAlphaNoneSkipLast,
provider,
NULL,
false,
@@ -403,7 +403,7 @@ touch_lo_copy_buffer(const void * source, size_t
sourceWidth, size_t sourceHeigh
32,
sourceBytesPerRow,
CGColorSpaceCreateDeviceRGB(),
- kCGImageAlphaNoneSkipFirst |
kCGBitmapByteOrder32Little,
+ kCGImageAlphaNoneSkipLast,
provider,
NULL,
false,
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 0a48e2d..ee80205 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -302,6 +302,7 @@ AquaSalGraphics::~AquaSalGraphics()
void AquaSalGraphics::SetTextColor( SalColor nSalColor )
{
maTextColor = RGBAColor( nSalColor );
+ // SAL_ DEBUG(std::hex << nSalColor << std::dec << "={" <<
maTextColor.GetRed() << ", " << maTextColor.GetGreen() << ", " <<
maTextColor.GetBlue() << ", " << maTextColor.GetAlpha() << "}");
if( mpTextStyle)
mpTextStyle->SetTextColor( maTextColor );
}
@@ -819,6 +820,13 @@ bool SvpSalGraphics::CheckContext()
CGColorSpaceCreateDeviceRGB(),
kCGImageAlphaNoneSkipLast);
break;
+ case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB:
+ mrContext = CGBitmapContextCreate(pixelBuffer.get(),
+ bufferSize.getX(), bufferSize.getY(),
+ 8, scanlineStride,
+ CGColorSpaceCreateDeviceRGB(),
+ kCGImageAlphaNoneSkipFirst);
+ break;
case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA:
mrContext = CGBitmapContextCreate(pixelBuffer.get(),
bufferSize.getX(), bufferSize.getY(),
@@ -826,6 +834,13 @@ bool SvpSalGraphics::CheckContext()
CGColorSpaceCreateDeviceRGB(),
kCGImageAlphaNoneSkipFirst |
kCGBitmapByteOrder32Little);
break;
+ case basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR:
+ mrContext = CGBitmapContextCreate(pixelBuffer.get(),
+ bufferSize.getX(), bufferSize.getY(),
+ 8, scanlineStride,
+ CGColorSpaceCreateDeviceRGB(),
+ kCGImageAlphaNoneSkipLast |
kCGBitmapByteOrder32Little);
+ break;
default:
SAL_WARN( "vcl.ios", "CheckContext: unsupported color format " <<
basebmp::formatName( m_aDevice->getScanlineFormat() ) );
warned = true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
