diff options
| -rw-r--r-- | libcdr/libcdr-0.0.3.patch (renamed from libcdr/libcdr-0.0.2.patch) | 8 | ||||
| -rw-r--r-- | libcdr/libcdr-msvc.patch | 64 | ||||
| -rw-r--r-- | libcdr/makefile.mk | 7 | ||||
| -rw-r--r-- | libcdr/prj/d.lst | 1 | ||||
| -rw-r--r-- | ooo.lst.in | 2 |
5 files changed, 9 insertions, 73 deletions
diff --git a/libcdr/libcdr-0.0.2.patch b/libcdr/libcdr-0.0.3.patch index 7760ddf057c1..3eda64b4f43b 100644 --- a/libcdr/libcdr-0.0.2.patch +++ b/libcdr/libcdr-0.0.3.patch @@ -1,5 +1,5 @@ ---- misc/libcdr-0.0.2/src/lib/libcdr_utils.h -+++ misc/build/libcdr-0.0.2/src/lib/libcdr_utils.h +--- misc/libcdr-0.0.3/src/lib/libcdr_utils.h ++++ misc/build/libcdr-0.0.3/src/lib/libcdr_utils.h @@ -41,17 +41,8 @@ #else @@ -18,8 +18,8 @@ #endif ---- misc/libcdr-0.0.2/src/lib/makefile.mk -+++ misc/build/libcdr-0.0.2/src/lib/makefile.mk +--- misc/libcdr-0.0.3/src/lib/makefile.mk ++++ misc/build/libcdr-0.0.3/src/lib/makefile.mk @@ -28,6 +28,10 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg .ENDIF diff --git a/libcdr/libcdr-msvc.patch b/libcdr/libcdr-msvc.patch deleted file mode 100644 index d5419e464a4d..000000000000 --- a/libcdr/libcdr-msvc.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- misc/libcdr-0.0.2/src/lib/CDRCollector.cpp 2012-02-10 13:53:41.351040000 +0000 -+++ misc/build/libcdr-0.0.2/src/lib/CDRCollector.cpp 2012-02-10 14:07:38.966966400 +0000 -@@ -35,6 +35,13 @@ - #define M_PI 3.14159265358979323846 - #endif - -+//http://msdn.microsoft.com/en-us/library/7wsh95e5%28VS.80%29.aspx -+//msvc 2005 doesn't have round -+inline double myround( double d ) -+{ -+ return floor( d + 0.5 ); -+} -+ - libcdr::CDRCollector::CDRCollector(libwpg::WPGPaintInterface *painter) : - m_painter(painter), - m_isPageProperties(false), -@@ -354,9 +361,9 @@ - satGreen = 0.0; - satBlue = (double)(360 - hue) / 60.0; - } -- red = (unsigned char)round(255*(1 - saturation + saturation * (satRed > 1 ? 1 : satRed)) * brightness); -- green = (unsigned char)round(255*(1 - saturation + saturation * (satGreen > 1 ? 1 : satGreen)) * brightness); -- blue = (unsigned char)round(255*(1 - saturation + saturation * (satBlue > 1 ? 1 : satBlue)) * brightness); -+ red = (unsigned char)myround(255*(1 - saturation + saturation * (satRed > 1 ? 1 : satRed)) * brightness); -+ green = (unsigned char)myround(255*(1 - saturation + saturation * (satGreen > 1 ? 1 : satGreen)) * brightness); -+ blue = (unsigned char)myround(255*(1 - saturation + saturation * (satBlue > 1 ? 1 : satBlue)) * brightness); - } - else if (colorModel == 0x07) // HLS - { -@@ -394,15 +401,15 @@ - - if (lightness < 0.5) - { -- red = (unsigned char)round(255.0*lightness*tmpRed); -- green = (unsigned char)round(255.0*lightness*tmpGreen); -- blue = (unsigned char)round(255.0*lightness*tmpBlue); -+ red = (unsigned char)myround(255.0*lightness*tmpRed); -+ green = (unsigned char)myround(255.0*lightness*tmpGreen); -+ blue = (unsigned char)myround(255.0*lightness*tmpBlue); - } - else - { -- red = (unsigned char)round(255*((1 - lightness) * tmpRed + 2 * lightness - 1)); -- green = (unsigned char)round(255*((1 - lightness) * tmpGreen + 2 * lightness - 1)); -- blue = (unsigned char)round(255*((1 - lightness) * tmpBlue + 2 * lightness - 1)); -+ red = (unsigned char)myround(255*((1 - lightness) * tmpRed + 2 * lightness - 1)); -+ green = (unsigned char)myround(255*((1 - lightness) * tmpGreen + 2 * lightness - 1)); -+ blue = (unsigned char)myround(255*((1 - lightness) * tmpBlue + 2 * lightness - 1)); - } - } - else if (colorModel == 0x09) // Grayscale ---- misc/libcdr-0.0.2/src/lib/CDRParser.cpp 2012-02-10 13:53:41.411126400 +0000 -+++ misc/build/libcdr-0.0.2/src/lib/CDRParser.cpp 2012-02-10 14:14:04.832200000 +0000 -@@ -547,8 +547,8 @@ - tmpPoints.push_back(points[i]); - } - } -- double scaleX = 72.0*fabs(X1 - X2)/(double)width; -- double scaleY = 72.0*fabs(Y1 - Y2)/(double)height; -+ double scaleX = 72.0*fabs(double(X1 - X2))/(double)width; -+ double scaleY = 72.0*fabs(double(Y1 - Y2))/(double)height; - m_collector->collectBitmap(imageId, colorMode, colorDepth, width, height, scaleX, scaleY); - } - diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk index acbd5a381d8e..74a9f8d0a13f 100644 --- a/libcdr/makefile.mk +++ b/libcdr/makefile.mk @@ -54,12 +54,11 @@ INCPRE+=$(WPG_CFLAGS) INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg .ENDIF -TARFILE_NAME=libcdr-0.0.2 -TARFILE_MD5=bb94fe29a21444369307f19015d48b82 +TARFILE_NAME=libcdr-0.0.3 +TARFILE_MD5=e5f1ef00a113d2edfd88af616934f293 PATCH_FILES=\ - libcdr-0.0.2.patch \ - libcdr-msvc.patch + libcdr-0.0.3.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/libcdr/prj/d.lst b/libcdr/prj/d.lst index 86806ba40287..f74aa6324332 100644 --- a/libcdr/prj/d.lst +++ b/libcdr/prj/d.lst @@ -1,5 +1,6 @@ mkdir: %_DEST%\inc\libcdr ..\%__SRC%\misc\build\libcdr*\src\lib\libcdr.h %_DEST%\inc\libcdr ..\%__SRC%\misc\build\libcdr*\src\lib\CDRDocument.h %_DEST%\inc\libcdr\ +..\%__SRC%\misc\build\libcdr*\src\lib\CDRStringVector.h %_DEST%\inc\libcdr\ ..\%__SRC%\lib\*.a %_DEST%\lib\*.a ..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/ooo.lst.in b/ooo.lst.in index 71d6f8f69857..94dbfa0e1b79 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz -bb94fe29a21444369307f19015d48b82-libcdr-0.0.2.tar.bz2 +e5f1ef00a113d2edfd88af616934f293-libcdr-0.0.3.tar.bz2 @GOOGLE_DOCS_EXTENSION_PACK@ @FREETYPE_TARBALL@ @FONTCONFIG_TARBALL@ |