GraphicsMagick: Makefile.am: No longer produce ".sig" files
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.2213.1673818998.1727.graphicsmagick-commit@lists.sourceforge.net> |
changeset 69e60c3218ba in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=69e60c3218ba summary: Makefile.am: No longer produce ".sig" files diffstat: ChangeLog | 8 + Makefile.am | 10 +- Makefile.in | 10 +- VisualMagick/installer/inc/version.isx | 4 +- coders/wpg.c | 4292 ++++++++++++++++---------------- magick/version.h | 4 +- www/Changelog.html | 16 + 7 files changed, 2180 insertions(+), 2164 deletions(-) diffs (truncated from 4450 to 500 lines): diff -r ad79caebdf24 -r 69e60c3218ba ChangeLog --- a/ChangeLog Sun Jan 15 17:24:28 2023 +0100 +++ b/ChangeLog Sun Jan 15 15:43:01 2023 -0600 @@ -1,3 +1,11 @@ +2023-01-15 Bob Friesenhahn <[email protected]> + + * coders/wpg.c: Change line terminations back to ISO standard + format. + + * Makefile.am: No longer produce ".sig" files since the ".asc" + files can do everything that the ".sig" files can do. + 2023-01-15 Fojtik Jaroslav <[email protected]> * VisualMagick/tests/runtest.bat diff -r ad79caebdf24 -r 69e60c3218ba Makefile.am --- a/Makefile.am Sun Jan 15 17:24:28 2023 +0100 +++ b/Makefile.am Sun Jan 15 15:43:01 2023 -0600 @@ -405,13 +405,12 @@ $(MAKE) $(DIST_ARCHIVE_SRPM) $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ - rm -f $${file}.asc $${file}.sig ; \ - $(GPG) --output $${file}.sig --detach-sig $${file} ; \ + rm -f $${file}.asc ; \ $(GPG) --output $${file}.asc --armor --detach-sig $${file} ; \ sha256sum $${file} > $${file}.sum ; \ done SRCDIR=$(SRCDIR) $(GRAPHICSMAGICK_SNAPSHOT_COPY) $(SNAPSHOT_DIST_ARCHIVES) \ - `for f in $(SNAPSHOT_DIST_ARCHIVES) ; do printf "%s.asc %s.sig " $$f $$f ; done` \ + `for f in $(SNAPSHOT_DIST_ARCHIVES) ; do printf "%s.asc " $$f $$f ; done` \ $(top_srcdir)/ChangeLog $(top_srcdir)/www/Changelog.html else @@ -422,7 +421,6 @@ $(MAKE) $(DIST_ARCHIVE_SRPM) $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ - $(GPG) --output $${file}.sig --detach-sig $${file} ; \ $(GPG) --output $${file}.asc --armor --detach-sig $${file} ; \ sha256sum $${file} > $${file}.sum ; \ done @@ -430,7 +428,6 @@ $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*-windows.7z* mv $(SNAPSHOT_DIST_ARCHIVES) $(SNAPSHOT_DIRECTORY)/ for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ - mv $${file}.sig $(SNAPSHOT_DIRECTORY)/ ; \ mv $${file}.asc $(SNAPSHOT_DIRECTORY)/ ; \ done cp $(top_srcdir)/ChangeLog $(SNAPSHOT_DIRECTORY)/ChangeLog.txt @@ -477,8 +474,7 @@ release: distcheck $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) for file in $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) ; do \ - rm -f $${file}.asc $${file}.sig ; \ - $(GPG) --output $${file}.sig --detach-sig $${file} ; \ + rm -f $${file}.asc ; \ $(GPG) --output $${file}.asc --armor --detach-sig $${file} ; \ sha256sum $${file} > $${file}.sum ; \ done diff -r ad79caebdf24 -r 69e60c3218ba Makefile.in --- a/Makefile.in Sun Jan 15 17:24:28 2023 +0100 +++ b/Makefile.in Sun Jan 15 15:43:01 2023 -0600 @@ -11467,19 +11467,17 @@ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(MAKE) $(DIST_ARCHIVE_SRPM) @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ -@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ rm -f $${file}.asc $${file}.sig ; \ -@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(GPG) --output $${file}.sig --detach-sig $${file} ; \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ rm -f $${file}.asc ; \ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(GPG) --output $${file}.asc --armor --detach-sig $${file} ; \ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ sha256sum $${file} > $${file}.sum ; \ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ done @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ SRCDIR=$(SRCDIR) $(GRAPHICSMAGICK_SNAPSHOT_COPY) $(SNAPSHOT_DIST_ARCHIVES) \ -@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ `for f in $(SNAPSHOT_DIST_ARCHIVES) ; do printf "%s.asc %s.sig " $$f $$f ; done` \ +@HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ `for f in $(SNAPSHOT_DIST_ARCHIVES) ; do printf "%s.asc " $$f $$f ; done` \ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_TRUE@ $(top_srcdir)/ChangeLog $(top_srcdir)/www/Changelog.html @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@snapshot: distcheck @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(MAKE) $(DIST_ARCHIVE_SRPM) @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ -@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(GPG) --output $${file}.sig --detach-sig $${file} ; \ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(GPG) --output $${file}.asc --armor --detach-sig $${file} ; \ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ sha256sum $${file} > $${file}.sum ; \ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ done @@ -11487,7 +11485,6 @@ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ $(RM) $(SNAPSHOT_DIRECTORY)/$(PACKAGE_NAME)-*-windows.7z* @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ mv $(SNAPSHOT_DIST_ARCHIVES) $(SNAPSHOT_DIRECTORY)/ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ for file in $(SNAPSHOT_DIST_ARCHIVES) ; do \ -@HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ mv $${file}.sig $(SNAPSHOT_DIRECTORY)/ ; \ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ mv $${file}.asc $(SNAPSHOT_DIRECTORY)/ ; \ @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ done @HasGRAPHICSMAGICK_SNAPSHOT_COPY_FALSE@ cp $(top_srcdir)/ChangeLog $(SNAPSHOT_DIRECTORY)/ChangeLog.txt @@ -11517,8 +11514,7 @@ release: distcheck $(MAKE) $(DIST_WINDOWS_SRC_7ZIP) for file in $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_7ZIP) ; do \ - rm -f $${file}.asc $${file}.sig ; \ - $(GPG) --output $${file}.sig --detach-sig $${file} ; \ + rm -f $${file}.asc ; \ $(GPG) --output $${file}.asc --armor --detach-sig $${file} ; \ sha256sum $${file} > $${file}.sum ; \ done diff -r ad79caebdf24 -r 69e60c3218ba VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Sun Jan 15 17:24:28 2023 +0100 +++ b/VisualMagick/installer/inc/version.isx Sun Jan 15 15:43:01 2023 -0600 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020230114" -#define public MagickPackageReleaseDate "snapshot-20230114" +#define public MagickPackageVersionAddendum ".020230115" +#define public MagickPackageReleaseDate "snapshot-20230115" diff -r ad79caebdf24 -r 69e60c3218ba coders/wpg.c --- a/coders/wpg.c Sun Jan 15 17:24:28 2023 +0100 +++ b/coders/wpg.c Sun Jan 15 15:43:01 2023 -0600 @@ -1,2146 +1,2146 @@ -/* -% Copyright (C) 2003-2022 GraphicsMagick Group -% Copyright (C) 2002 ImageMagick Studio -% -% This program is covered by multiple licenses, which are described in -% Copyright.txt. You should have received a copy of Copyright.txt with this -% package; otherwise see http://www.graphicsmagick.org/www/Copyright.html. -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% % -% W W PPPP GGGG % -% W W P P G % -% W W W PPPP G GGG % -% WW WW P G G % -% W W P GGG % -% % -% % -% Read WordPerfect Image Format. % -% % -% % -% Software Design % -% Jaroslav Fojtik % -% June 2000 - 2023 % -% Rework for GraphicsMagick % -% Bob Friesenhahn % -% Feb-May 2003 % -% % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% -*/ - -/* - Include declarations. -*/ -#include "magick/studio.h" -#include "magick/blob.h" -#include "magick/colormap.h" -#include "magick/constitute.h" -#include "magick/log.h" -#include "magick/magic.h" -#include "magick/magick.h" -#include "magick/pixel_cache.h" -#include "magick/shear.h" -#include "magick/tempfile.h" -#include "magick/transform.h" -#include "magick/quantize.h" -#include "magick/utility.h" - - -typedef struct - { - unsigned char Red; - unsigned char Blue; - unsigned char Green; - } RGB_Record; - -/* Default palette for WPG level 1 */ -static const RGB_Record WPG1_Palette[256]={ -{ 0, 0, 0}, { 0, 0,168}, -{ 0,168, 0}, { 0,168,168}, -{168, 0, 0}, {168, 0,168}, -{168, 84, 0}, {168,168,168}, -{ 84, 84, 84}, { 84, 84,252}, -{ 84,252, 84}, { 84,252,252}, -{252, 84, 84}, {252, 84,252}, -{252,252, 84}, {252,252,252}, /*16*/ -{ 0, 0, 0}, { 20, 20, 20}, -{ 32, 32, 32}, { 44, 44, 44}, -{ 56, 56, 56}, { 68, 68, 68}, -{ 80, 80, 80}, { 96, 96, 96}, -{112,112,112}, {128,128,128}, -{144,144,144}, {160,160,160}, -{180,180,180}, {200,200,200}, -{224,224,224}, {252,252,252}, /*32*/ -{ 0, 0,252}, { 64, 0,252}, -{124, 0,252}, {188, 0,252}, -{252, 0,252}, {252, 0,188}, -{252, 0,124}, {252, 0, 64}, -{252, 0, 0}, {252, 64, 0}, -{252,124, 0}, {252,188, 0}, -{252,252, 0}, {188,252, 0}, -{124,252, 0}, { 64,252, 0}, /*48*/ -{ 0,252, 0}, { 0,252, 64}, -{ 0,252,124}, { 0,252,188}, -{ 0,252,252}, { 0,188,252}, -{ 0,124,252}, { 0, 64,252}, -{124,124,252}, {156,124,252}, -{188,124,252}, {220,124,252}, -{252,124,252}, {252,124,220}, -{252,124,188}, {252,124,156}, /*64*/ -{252,124,124}, {252,156,124}, -{252,188,124}, {252,220,124}, -{252,252,124}, {220,252,124}, -{188,252,124}, {156,252,124}, -{124,252,124}, {124,252,156}, -{124,252,188}, {124,252,220}, -{124,252,252}, {124,220,252}, -{124,188,252}, {124,156,252}, /*80*/ -{180,180,252}, {196,180,252}, -{216,180,252}, {232,180,252}, -{252,180,252}, {252,180,232}, -{252,180,216}, {252,180,196}, -{252,180,180}, {252,196,180}, -{252,216,180}, {252,232,180}, -{252,252,180}, {232,252,180}, -{216,252,180}, {196,252,180}, /*96*/ -{180,220,180}, {180,252,196}, -{180,252,216}, {180,252,232}, -{180,252,252}, {180,232,252}, -{180,216,252}, {180,196,252}, -{0,0,112}, {28,0,112}, -{56,0,112}, {84,0,112}, -{112,0,112}, {112,0,84}, -{112,0,56}, {112,0,28}, /*112*/ -{112,0,0}, {112,28,0}, -{112,56,0}, {112,84,0}, -{112,112,0}, {84,112,0}, -{56,112,0}, {28,112,0}, -{0,112,0}, {0,112,28}, -{0,112,56}, {0,112,84}, -{0,112,112}, {0,84,112}, -{0,56,112}, {0,28,112}, /*128*/ -{56,56,112}, {68,56,112}, -{84,56,112}, {96,56,112}, -{112,56,112}, {112,56,96}, -{112,56,84}, {112,56,68}, -{112,56,56}, {112,68,56}, -{112,84,56}, {112,96,56}, -{112,112,56}, {96,112,56}, -{84,112,56}, {68,112,56}, /*144*/ -{56,112,56}, {56,112,69}, -{56,112,84}, {56,112,96}, -{56,112,112}, {56,96,112}, -{56,84,112}, {56,68,112}, -{80,80,112}, {88,80,112}, -{96,80,112}, {104,80,112}, -{112,80,112}, {112,80,104}, -{112,80,96}, {112,80,88}, /*160*/ -{112,80,80}, {112,88,80}, -{112,96,80}, {112,104,80}, -{112,112,80}, {104,112,80}, -{96,112,80}, {88,112,80}, -{80,112,80}, {80,112,88}, -{80,112,96}, {80,112,104}, -{80,112,112}, {80,114,112}, -{80,96,112}, {80,88,112}, /*176*/ -{0,0,64}, {16,0,64}, -{32,0,64}, {48,0,64}, -{64,0,64}, {64,0,48}, -{64,0,32}, {64,0,16}, -{64,0,0}, {64,16,0}, -{64,32,0}, {64,48,0}, -{64,64,0}, {48,64,0}, -{32,64,0}, {16,64,0}, /*192*/ -{0,64,0}, {0,64,16}, -{0,64,32}, {0,64,48}, -{0,64,64}, {0,48,64}, -{0,32,64}, {0,16,64}, -{32,32,64}, {40,32,64}, -{48,32,64}, {56,32,64}, -{64,32,64}, {64,32,56}, -{64,32,48}, {64,32,40}, /*208*/ -{64,32,32}, {64,40,32}, -{64,48,32}, {64,56,32}, -{64,64,32}, {56,64,32}, -{48,64,32}, {40,64,32}, -{32,64,32}, {32,64,40}, -{32,64,48}, {32,64,56}, -{32,64,64}, {32,56,64}, -{32,48,64}, {32,40,64}, /*224*/ -{44,44,64}, {48,44,64}, -{52,44,64}, {60,44,64}, -{64,44,64}, {64,44,60}, -{64,44,52}, {64,44,48}, -{64,44,44}, {64,48,44}, -{64,52,44}, {64,60,44}, -{64,64,44}, {60,64,44}, -{52,64,44}, {48,64,44}, /*240*/ -{44,64,44}, {44,64,48}, -{44,64,52}, {44,64,60}, -{44,64,64}, {44,60,64}, -{44,55,64}, {44,48,64}, -{0,0,0}, {0,0,0}, -{0,0,0}, {0,0,0}, -{0,0,0}, {0,0,0}, -{0,0,0}, {0,0,0} /*256*/ -}; - - -static int ApproveFormatForWPG(const char *Format) -{ - if(!strcmp(Format,"PFB")) return 0; - return 1; -} - - - -/* -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% % -% % -% I s W P G % -% % -% % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% IsWPG() returns True if the image format type, identified by the magick -% string, is WPG. -% -% The format of the IsWPG method is: -% -% unsigned int IsWPG(const unsigned char *magick,const size_t length) -% -% A description of each parameter follows: -% -% o status: Method IsWPG returns True if the image format type is WPG. -% -% o magick: This string is generally the first few bytes of an image file -% or blob. -% -% o length: Specifies the length of the magick string. -% -% -*/ -static unsigned int IsWPG(const unsigned char *magick,const size_t length) -{ - if (length < 4) - return(False); - if (memcmp(magick,"\377WPC",4) == 0) - return(True); - return(False); -} - -static int Rd_WP_DWORD(Image *image, unsigned long *d) -{ - unsigned char b; - - b = ReadBlobByte(image); - *d = b; - if (b < 0xFFU) - return 1; - b = ReadBlobByte(image); - *d = (unsigned long) b; - b = ReadBlobByte(image); - *d+=(unsigned long) b*256l; - if (*d < 0x8000) - return 3; - *d=(*d & 0x7FFF) << 16; - b = ReadBlobByte(image); - *d += (unsigned long) b; - b=ReadBlobByte(image); - *d += (unsigned long) b*256l; - return 5; -} - - -static MagickPassFail InsertRow(unsigned char *p,unsigned long y, Image *image, int bpp) -{ - unsigned long - x; - register PixelPacket - *q; - MagickPassFail RetVal = MagickFail; - IndexPacket index; - IndexPacket *indexes; - - if (image->logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Insert row %ld of %lu...", y, image->rows); - - q = SetImagePixels(image,0,y,image->columns,1); - if(q == (PixelPacket *) NULL) - return MagickFail; - - switch (bpp) - { - case 1: /* Convert bitmap scanline. WP seems to ignore palette even if it is present. */ - RetVal = ImportImagePixelArea(image,GrayQuantum,bpp,p,NULL,0); - break; - - case 4: /* Convert PseudoColor scanline. */ - case 8: /* Convert PseudoColor scanline. */ - RetVal = ImportImagePixelArea(image,IndexQuantum,bpp,p,NULL,0); - break; - - case 2: /* Convert PseudoColor scanline. */ - { - indexes=AccessMutableIndexes(image); - if ((image->storage_class != PseudoClass) || - (indexes == (IndexPacket *) NULL)) - { - if (image->logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Image has no colormap, skipping..."); - return MagickFail; - } - x = 0; - while(x+3 < image->columns) - { - index = (IndexPacket)((*p >> 6) & 0x3); - VerifyColormapIndex(image,index); - indexes[x++]=index; - *q++=image->colormap[index]; - index = (IndexPacket)((*p >> 4) & 0x3); - VerifyColormapIndex(image,index); - indexes[x++]=index; - *q++=image->colormap[index]; - index = (IndexPacket)((*p >> 2) & 0x3); - VerifyColormapIndex(image,index); - indexes[x++]=index; - *q++ = image->colormap[index]; - index = (IndexPacket)((*p) & 0x3); - VerifyColormapIndex(image,index); - indexes[x++]=index; - *q++ = image->colormap[index]; - p++; - } - if(x < image->columns) - { - index = (IndexPacket) ((*p >> 6) & 0x3); - VerifyColormapIndex(image,index); - indexes[x++] = index; - *q++=image->colormap[index]; - if(x < image->columns) - { - index = (IndexPacket) ((*p >> 4) & 0x3); - VerifyColormapIndex(image,index); - indexes[x++] = index; - *q++=image->colormap[index]; - if(x < image->columns) - { - index = (IndexPacket)((*p >> 2) & 0x3); - VerifyColormapIndex(image,index); - indexes[x] = index; - *q++=image->colormap[index]; - } - } - /* p++; */ - } - RetVal = MagickPass; - break; - } - - case 24: /* Convert DirectColor scanline. */ - RetVal = ImportImagePixelArea(image,RGBQuantum,8,p,NULL,0); - break; - - default: - if (image->logging) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Unsupported bits per pixel %u",bpp); - - return MagickFail; /* emit some error here */ - } - - - if(RetVal==MagickFail) - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(),"ImportImagePixelArea failed for row: %lu, bpp: %d", y, bpp); - return MagickFail; - } - - if(!SyncImagePixels(image)) - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(),"SyncImagePixels failed for row: %ld, bpp: %d", y, bpp); - return MagickFail; - } - -return RetVal; -} - - -/* Helper for WPG1 raster reader. */ -#define InsertByte(b) \ -{ \ - BImgBuff[x]=b; \ - x++; \