• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Revision6ca786747f889afffdf9fb2aad6565ec50951857 (tree)
Time2010-02-23 04:34:41
AuthorBob Friesenhahn <bfriesen@Grap...>
CommiterBob Friesenhahn

Log Message

* magick/static.h: DCRAW module registration function prototypes
were missing.

* coders/jp2.c (RegisterJP2Image): entry->module needs to be
assigned an allocated string rather than a static string. This
was causing a crash under FreeBSD.

* magick/resize.c (HorizontalFilter, VerticalFilter): Stop GCC
warnings if OpenMP is not supported.

Change Summary

Incremental Difference

diff -r d4b0d0b34144 -r 6ca786747f88 ChangeLog
--- a/ChangeLog Wed Jan 06 18:11:11 2010 -0600
+++ b/ChangeLog Mon Feb 22 13:34:41 2010 -0600
@@ -1,3 +1,15 @@
1+2010-02-22 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
2+
3+ * magick/static.h: DCRAW module registration function prototypes
4+ were missing.
5+
6+ * coders/jp2.c (RegisterJP2Image): entry->module needs to be
7+ assigned an allocated string rather than a static string. This
8+ was causing a crash under FreeBSD.
9+
10+ * magick/resize.c (HorizontalFilter, VerticalFilter): Stop GCC
11+ warnings if OpenMP is not supported.
12+
113 2010-01-06 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
214
315 * version.sh: GraphicsMagick 1.2.10 released.
diff -r d4b0d0b34144 -r 6ca786747f88 coders/jp2.c
--- a/coders/jp2.c Wed Jan 06 18:11:11 2010 -0600
+++ b/coders/jp2.c Mon Feb 22 13:34:41 2010 -0600
@@ -681,7 +681,7 @@
681681
682682 entry=SetMagickInfo("J2C");
683683 entry->description=AcquireString("JPEG-2000 Code Stream Syntax");
684- entry->module="JP2";
684+ entry->module=AcquireString("JP2");
685685 entry->magick=(MagickHandler) IsJPC;
686686 entry->adjoin=False;
687687 entry->seekable_stream=True;
@@ -694,7 +694,7 @@
694694
695695 entry=SetMagickInfo("JP2");
696696 entry->description=AcquireString("JPEG-2000 JP2 File Format Syntax");
697- entry->module="JP2";
697+ entry->module=AcquireString("JP2");
698698 entry->magick=(MagickHandler) IsJP2;
699699 entry->adjoin=False;
700700 entry->seekable_stream=True;
@@ -707,7 +707,7 @@
707707
708708 entry=SetMagickInfo("JPC");
709709 entry->description=AcquireString("JPEG-2000 Code Stream Syntax");
710- entry->module="JP2";
710+ entry->module=AcquireString("JP2");
711711 entry->magick=(MagickHandler) IsJPC;
712712 entry->adjoin=False;
713713 entry->seekable_stream=True;
@@ -720,7 +720,7 @@
720720
721721 entry=SetMagickInfo("PGX");
722722 entry->description=AcquireString("JPEG-2000 VM Format");
723- entry->module="JP2";
723+ entry->module=AcquireString("JP2");
724724 entry->magick=(MagickHandler) IsJPC;
725725 entry->adjoin=False;
726726 entry->seekable_stream=True;
diff -r d4b0d0b34144 -r 6ca786747f88 magick/resize.c
--- a/magick/resize.c Wed Jan 06 18:11:11 2010 -0600
+++ b/magick/resize.c Mon Feb 22 13:34:41 2010 -0600
@@ -913,7 +913,9 @@
913913 break;
914914 source_indexes=GetIndexes(source);
915915 indexes=GetIndexes(destination);
916-#pragma omp parallel for private(i)
916+#if defined(_OPENMP)
917+# pragma omp parallel for private(i)
918+#endif
917919 for (y=0; y < (long) destination->rows; y++)
918920 {
919921 double
@@ -1073,7 +1075,9 @@
10731075 break;
10741076 source_indexes=GetIndexes(source);
10751077 indexes=GetIndexes(destination);
1076-#pragma omp parallel for private(i)
1078+#if defined(_OPENMP)
1079+# pragma omp parallel for private(i)
1080+#endif
10771081 for (x=0; x < (long) destination->columns; x++)
10781082 {
10791083 double
diff -r d4b0d0b34144 -r 6ca786747f88 magick/static.h
--- a/magick/static.h Wed Jan 06 18:11:11 2010 -0600
+++ b/magick/static.h Mon Feb 22 13:34:41 2010 -0600
@@ -28,6 +28,7 @@
2828 RegisterCMYKImage(void),
2929 RegisterCUTImage(void),
3030 RegisterDCMImage(void),
31+ RegisterDCRAWImage(void),
3132 RegisterDCXImage(void),
3233 RegisterDIBImage(void),
3334 RegisterDPSImage(void),
@@ -159,6 +160,7 @@
159160 UnregisterCMYKImage(void),
160161 UnregisterCUTImage(void),
161162 UnregisterDCMImage(void),
163+ UnregisterDCRAWImage(void),
162164 UnregisterDCXImage(void),
163165 UnregisterDIBImage(void),
164166 UnregisterDPSImage(void),
diff -r d4b0d0b34144 -r 6ca786747f88 magick/version.h
--- a/magick/version.h Wed Jan 06 18:11:11 2010 -0600
+++ b/magick/version.h Mon Feb 22 13:34:41 2010 -0600
@@ -38,7 +38,7 @@
3838 #define MagickLibVersion 0x020002
3939 #define MagickLibVersionText "1.2.10"
4040 #define MagickLibVersionNumber 2,0,2
41-#define MagickChangeDate "20100106"
41+#define MagickChangeDate "20100222"
4242 #define MagickReleaseDate "2010-01-06"
4343
4444 /*
diff -r d4b0d0b34144 -r 6ca786747f88 www/Changelog.html
--- a/www/Changelog.html Wed Jan 06 18:11:11 2010 -0600
+++ b/www/Changelog.html Mon Feb 22 13:34:41 2010 -0600
@@ -21,6 +21,21 @@
2121 </tr>
2222 </table>
2323 <p>
24+2010-02-22 Bob Friesenhahn &lt;bfriesen@simple.dallas.tx.us&gt;
25+
26+<UL>
27+ <LI> magick/static.h: DCRAW module registration function prototypes
28+ were missing.
29+
30+ <LI> coders/jp2.c (RegisterJP2Image): entry-&gt;module needs to be
31+ assigned an allocated string rather than a static string. This
32+ was causing a crash under FreeBSD.
33+
34+ <LI> magick/resize.c (HorizontalFilter, VerticalFilter): Stop GCC
35+ warnings if OpenMP is not supported.
36+
37+</UL>
38+<p>
2439 2010-01-06 Bob Friesenhahn &lt;bfriesen@simple.dallas.tx.us&gt;
2540
2641 <UL>
Show on old repository browser