Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
ada908ab
Kaydet (Commit)
ada908ab
authored
Şub 23, 2012
tarafından
Fridrich Štrba
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
New release of libcdr 0.0.3, the best FOSS CDR converter ever
üst
419cceda
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
73 deletions
+9
-73
libcdr-0.0.3.patch
libcdr/libcdr-0.0.3.patch
+4
-4
libcdr-msvc.patch
libcdr/libcdr-msvc.patch
+0
-64
makefile.mk
libcdr/makefile.mk
+3
-4
d.lst
libcdr/prj/d.lst
+1
-0
ooo.lst.in
ooo.lst.in
+1
-1
No files found.
libcdr/libcdr-0.0.
2
.patch
→
libcdr/libcdr-0.0.
3
.patch
Dosyayı görüntüle @
ada908ab
--- misc/libcdr-0.0.
2
/src/lib/libcdr_utils.h
--- misc/libcdr-0.0.
3
/src/lib/libcdr_utils.h
+++ misc/build/libcdr-0.0.
2
/src/lib/libcdr_utils.h
+++ misc/build/libcdr-0.0.
3
/src/lib/libcdr_utils.h
@@ -41,17 +41,8 @@
@@ -41,17 +41,8 @@
#else
#else
...
@@ -18,8 +18,8 @@
...
@@ -18,8 +18,8 @@
#endif
#endif
--- misc/libcdr-0.0.
2
/src/lib/makefile.mk
--- misc/libcdr-0.0.
3
/src/lib/makefile.mk
+++ misc/build/libcdr-0.0.
2
/src/lib/makefile.mk
+++ misc/build/libcdr-0.0.
3
/src/lib/makefile.mk
@@ -28,6 +28,10 @@
@@ -28,6 +28,10 @@
INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
.ENDIF
.ENDIF
...
...
libcdr/libcdr-msvc.patch
deleted
100644 → 0
Dosyayı görüntüle @
419cceda
--- 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);
}
libcdr/makefile.mk
Dosyayı görüntüle @
ada908ab
...
@@ -54,12 +54,11 @@ INCPRE+=$(WPG_CFLAGS)
...
@@ -54,12 +54,11 @@ INCPRE+=$(WPG_CFLAGS)
INCPRE
+=
$(SOLARVER)$/$(INPATH)$/
inc
$/
libwpg
INCPRE
+=
$(SOLARVER)$/$(INPATH)$/
inc
$/
libwpg
.ENDIF
.ENDIF
TARFILE_NAME
=
libcdr-0.0.
2
TARFILE_NAME
=
libcdr-0.0.
3
TARFILE_MD5
=
bb94fe29a21444369307f19015d48b82
TARFILE_MD5
=
e5f1ef00a113d2edfd88af616934f293
PATCH_FILES
=
\
PATCH_FILES
=
\
libcdr-0.0.2.patch
\
libcdr-0.0.3.patch
libcdr-msvc.patch
BUILD_ACTION
=
dmake
$(MFLAGS)
$(CALLMACROS)
BUILD_ACTION
=
dmake
$(MFLAGS)
$(CALLMACROS)
BUILD_DIR
=
src
$/
lib
BUILD_DIR
=
src
$/
lib
...
...
libcdr/prj/d.lst
Dosyayı görüntüle @
ada908ab
mkdir: %_DEST%\inc\libcdr
mkdir: %_DEST%\inc\libcdr
..\%__SRC%\misc\build\libcdr*\src\lib\libcdr.h %_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\CDRDocument.h %_DEST%\inc\libcdr\
..\%__SRC%\misc\build\libcdr*\src\lib\CDRStringVector.h %_DEST%\inc\libcdr\
..\%__SRC%\lib\*.a %_DEST%\lib\*.a
..\%__SRC%\lib\*.a %_DEST%\lib\*.a
..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
ooo.lst.in
Dosyayı görüntüle @
ada908ab
...
@@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
...
@@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
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@
@GOOGLE_DOCS_EXTENSION_PACK@
@FREETYPE_TARBALL@
@FREETYPE_TARBALL@
@FONTCONFIG_TARBALL@
@FONTCONFIG_TARBALL@
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment