Changes - SailfishOS Open Build Service

Changes of Revision 4

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:ImageMagick.changes
@@ -1,3 +1,6 @@ +* Thu Nov 15 2021 Nephros <sailfish@nephros.org> - 7.1.0.13-1.1 +- version bump + * Thu Sep 23 2021 Nephros <sailfish@nephros.org> - 7.1.0.9-1.1 - version bump
[-] [+]	Changed	_service:tar_git:ImageMagick.spec ^
@@ -7,7 +7,7 @@ # >> macros # << macros -%define mfr_revision 9 +%define mfr_revision 13 %define maj 7 %define mfr_version %{maj}.1.0 %define quantum_depth 16 @@ -16,7 +16,7 @@ %define source_version %{mfr_version}-%{mfr_revision} Summary: Viewer and Converter for Images -Version: 7.1.0.9+obs1.1 +Version: 7.1.0.13+obs1.1 Release: 1.1 Group: Applications/Multimedia License: ImageMagick
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://gitlab.com/nephros/harbour-imagemagick</param> <param name="branch">obs</param> - <param name="revision">7.1.0.9+obs1.1</param> + <param name="revision">7.1.0.13+obs1.1</param> <param name="debian">N</param> <param name="dumb">N</param> </service>
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/.github/workflows/daily.yml ^
@@ -119,6 +119,52 @@ set /p solution=<solution msbuild %solution% /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.platform}} + build_windows_zero_configuration: + name: 'Windows Q16-x64 hdri=yes (zero configuration ${{matrix.buildType}})' + runs-on: windows-latest + + strategy: + fail-fast: false + matrix: + buildType: [ dmt, smtd ] + + steps: + - name: Clone ImageMagick-Windows + uses: actions/checkout@v2 + with: + repository: ImageMagick/ImageMagick-Windows + path: ImageMagick-Windows + ref: refs/heads/main + fetch-depth: 1 + + - name: Clone repositories + shell: cmd + run: \| + cd %GITHUB_WORKSPACE%\ImageMagick-Windows + CloneRepositories.cmd https://github.com/ImageMagick shallow + + - name: Build configure + shell: cmd + run: \| + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" + cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure + msbuild configure.2019.sln /m /t:Rebuild /p:Configuration=Release,Platform=Win32 + + - name: Configure ImageMagick + shell: cmd + run: \| + cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure + configure.exe /noWizard /VS2019 /x64 /${{matrix.buildType}} /zeroConfigurationSupport + + - name: Build ImageMagick + shell: cmd + run: \| + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" + cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick + dir /B *.sln > solution + set /p solution=<solution + msbuild %solution% /m /t:Rebuild /p:Configuration=Release,Platform=x64 + build_msys2: name: 'Windows Q16-${{matrix.toolchain}} hdri=yes (MSYS2)' runs-on: windows-latest
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/AUTHORS.txt ^
@@ -1,4 +1,4 @@ -These active developers and have made source code contributions to the +These active developers have made source code contributions to the ImageMagick project in the last few years: Cristy
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/ChangeLog ^
@@ -1,13 +1,45 @@ +2021-10-28 7.1.0-13 <quetzlzacatenango@image...> + * Release ImageMagick version 7.1.0-13 GIT revision 19325:987f36b50:20211028 + +2021-10-28 7.1.0-13 Dirk Lemstra <dirk@lem.....org> + * Fix stack overflow when parsing malicious ps image file (report from + Muhammad Aldo Firmansyah). + +2021-10-25 7.1.0-12 <quetzlzacatenango@image...> + * Release ImageMagick version 7.1.0-12 GIT revision 19318:113f8f901:20211025 + +2021-10-15 7.1.0-12 <quetzlzacatenango@image...> + * Fix x64 build. + +2021-10-24 7.1.0-11 <quetzlzacatenango@image...> + * Release ImageMagick version 7.1.0-11 GIT revision 19313:fbf76f2ef:20211024 + +2021-10-11 7.1.0-11 <quetzlzacatenango@image...> + * Fix connected component abort trap (reference + https://github.com/ImageMagick/ImageMagick/issues/4372). + * Fix possible unitialized values (reference + https://github.com/ImageMagick/ImageMagick/issues/4379). + * Fix stack overflow when parsing malicious tiff image file (report from + Muhammad Aldo Firmansyah). + +2021-10-10 7.1.0-10 <quetzlzacatenango@image...> + * Release ImageMagick version 7.1.0-10 GIT revision 19236:07ebe6b6e:20211010 + +2021-10-03 7.1.0-10 <quetzlzacatenango@image...> + * Improved algorithm for automatic calculation of pointsize for caption and + labels. + * Support -auto-orient option in the identify utlity. + 2021-10-03 7.1.0-9 <quetzlzacatenango@image...> * Release ImageMagick version 7.1.0-9 GIT revision 19220:7921bf068:20211003 2021-10-03 7.1.0-9 Dirk Lemstra <dirk@lem.....org> * Squash a dump truck load of VisualStudio compiler warnings. - * improved algorithm for automatic calculation of word breaks and pointsize + * Improved algorithm for automatic calculation of word breaks and pointsize for caption and labels. 2021-09-19 7.1.0-9 <quetzlzacatenango@image...> - * improve wrapping between words and within words (reference + * Improve wrapping between words and within words (reference https://github.com/ImageMagick/ImageMagick/discussions/4227). 2021-09-18 7.1.0-8 <quetzlzacatenango@image...>
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/Magick++/lib/Color.cpp ^
@@ -12,11 +12,11 @@ #include "Magick++/Include.h" #include <string> -using namespace std; - #include "Magick++/Color.h" #include "Magick++/Exception.h" +using namespace std; + MagickPPExport int Magick::operator == (const Magick::Color &left_, const Magick::Color &right_) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/Magick++/lib/Functions.cpp ^
@@ -12,11 +12,11 @@ #include "Magick++/Include.h" #include <string> -using namespace std; - #include "Magick++/Functions.h" #include "Magick++/Exception.h" +using namespace std; + static bool magick_initialized=false; // Clone C++ string as allocated C string, de-allocating any existing string
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/Magick++/lib/Geometry.cpp ^
@@ -16,11 +16,11 @@ #include <strings.h> #endif -using namespace std; - #include "Magick++/Geometry.h" #include "Magick++/Exception.h" +using namespace std; + MagickPPExport int Magick::operator == (const Magick::Geometry& left_, const Magick::Geometry& right_) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/Magick++/lib/Image.cpp ^
@@ -16,14 +16,14 @@ #include <errno.h> #include <math.h> -using namespace std; - #include "Magick++/Image.h" #include "Magick++/Functions.h" #include "Magick++/Pixels.h" #include "Magick++/Options.h" #include "Magick++/ImageRef.h" +using namespace std; + #define AbsoluteValue(x) ((x) < 0 ? -(x) : (x)) #define MagickPI 3.14159265358979323846264338327950288419716939937510 #define DegreesToRadians(x) (MagickPI*(x)/180.0)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/Magick++/lib/Magick++/Include.h ^
@@ -10,7 +10,7 @@ #if !defined(_MAGICK_CONFIG_H) # define _MAGICK_CONFIG_H -# if !defined(vms) && !defined(macintosh) +# if !defined(vms) # include "MagickCore/magick-config.h" # else # include "magick-config.h"
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/Magick++/lib/SecurityPolicy.cpp ^
@@ -8,11 +8,12 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include "Magick++/SecurityPolicy.h" -#include "Magick++/Exception.h" #include <string> #include <sstream> +#include "Magick++/SecurityPolicy.h" +#include "Magick++/Exception.h" + using namespace std; bool Magick::SecurityPolicy::anonymousCacheMemoryMap()
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/MagickCore.h ^
@@ -25,7 +25,7 @@ #if !defined(MAGICKCORE_CONFIG_H) # define MAGICKCORE_CONFIG_H -# if !defined(vms) && !defined(macintosh) +# if !defined(vms) # include "MagickCore/magick-config.h" # else # include "magick-config.h"
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/annotate.c ^
@@ -1529,10 +1529,11 @@ geometry_flags; geometry_flags=ParseGeometry(draw_info->density,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((geometry_flags & SigmaValue) == 0) - resolution.y=resolution.x; + if ((geometry_flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((geometry_flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } ft_status=FT_Set_Char_Size(face,(FT_F26Dot6) (64.0draw_info->pointsize), (FT_F26Dot6) (64.0draw_info->pointsize),(FT_UInt) resolution.x, @@ -2117,10 +2118,11 @@ flags; flags=ParseGeometry(draw_info->density,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - resolution.y=resolution.x; + if ((flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } if (identity == MagickFalse) (void) TransformImage(&annotate_image,"0x0",(char *) NULL,exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/attribute.c ^
@@ -1580,8 +1580,7 @@ assert(image->signature == MagickCoreSignature); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - if ((image->type == BilevelType) \|\| (image->type == GrayscaleType) \|\| - (image->type == GrayscaleAlphaType)) + if (IsImageGray(image) != MagickFalse) return(image->type); if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse) return(UndefinedType); @@ -1738,8 +1737,7 @@ return(ColorSeparationAlphaType); } type=IdentifyImageGray(image,exception); - if ((type == BilevelType) \|\| (type == GrayscaleType) \|\| - (type == GrayscaleAlphaType)) + if (IsGrayImageType(type)) return(type); if (IdentifyPaletteImage(image,exception) != MagickFalse) { @@ -1779,8 +1777,7 @@ { assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - if ((image->type == BilevelType) \|\| (image->type == GrayscaleType) \|\| - (image->type == GrayscaleAlphaType)) + if (IsGrayImageType(image->type)) return(MagickTrue); return(MagickFalse); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/blob.c ^
@@ -3190,7 +3190,7 @@ / static inline MagickBooleanType SetStreamBuffering(const ImageInfo image_info, - Image image) + const BlobInfo blob_info) { const char option; @@ -3205,7 +3205,7 @@ option=GetImageOption(image_info,"stream:buffer-size"); if (option != (const char ) NULL) size=StringToUnsignedLong(option); - status=setvbuf(image->blob->file_info.file,(char ) NULL,size == 0 ? + status=setvbuf(blob_info->file_info.file,(char ) NULL,size == 0 ? _IONBF : _IOFBF,size); return(status == 0 ? MagickTrue : MagickFalse); } @@ -3295,17 +3295,17 @@ blob_info->file_info.file=(type == 'r') ? stdin : stdout; #if defined(MAGICKCORE_WINDOWS_SUPPORT) \|\| defined(__OS2__) if (strchr(type,'b') != (char ) NULL) - setmode(fileno(blob_info->file_info.file),_O_BINARY); + (void) setmode(fileno(blob_info->file_info.file),_O_BINARY); #endif blob_info->type=StandardStream; blob_info->exempt=MagickTrue; - return(SetStreamBuffering(image_info,image)); + return(SetStreamBuffering(image_info,blob_info)); } if ((LocaleNCompare(filename,"fd:",3) == 0) && (IsGeometry(filename+3) != MagickFalse)) { char - fileMode[MagickPathExtent]; + fileMode[2]; fileMode =(type); fileMode[1]='\0'; @@ -3317,11 +3317,11 @@ } #if defined(MAGICKCORE_WINDOWS_SUPPORT) \|\| defined(__OS2__) if (strchr(type,'b') != (char ) NULL) - setmode(fileno(blob_info->file_info.file),_O_BINARY); + (void) setmode(fileno(blob_info->file_info.file),_O_BINARY); #endif blob_info->type=FileStream; blob_info->exempt=MagickTrue; - return(SetStreamBuffering(image_info,image)); + return(SetStreamBuffering(image_info,blob_info)); } #if defined(MAGICKCORE_HAVE_POPEN) && defined(MAGICKCORE_PIPES_SUPPORT) if (filename == '\|') @@ -3349,7 +3349,7 @@ } blob_info->type=PipeStream; blob_info->exempt=MagickTrue; - return(SetStreamBuffering(image_info,image)); + return(SetStreamBuffering(image_info,blob_info)); } #endif status=GetPathAttributes(filename,&blob_info->properties); @@ -3364,7 +3364,7 @@ } blob_info->type=FileStream; blob_info->exempt=MagickTrue; - return(SetStreamBuffering(image_info,image)); + return(SetStreamBuffering(image_info,blob_info)); } #endif GetPathComponent(image->filename,ExtensionPath,extension); @@ -3395,9 +3395,6 @@ "%s-%.20g.%s",path,(double) image->scene,extension); } (void) CopyMagickString(image->filename,filename,MagickPathExtent); -#if defined(macintosh) - SetApplicationType(filename,image_info->magick,'8BIM'); -#endif } } if (image_info->file != (FILE ) NULL) @@ -3419,7 +3416,7 @@ magick[3]; blob_info->type=FileStream; - (void) SetStreamBuffering(image_info,image); + (void) SetStreamBuffering(image_info,blob_info); (void) memset(magick,0,sizeof(magick)); count=fread(magick,1,sizeof(magick),blob_info->file_info.file); (void) fseek(blob_info->file_info.file,-((off_t) count),SEEK_CUR); @@ -3496,37 +3493,37 @@ } } } + } + else +#if defined(MAGICKCORE_ZLIB_DELEGATE) + if ((LocaleCompare(extension,"Z") == 0) \|\| + (LocaleCompare(extension,"gz") == 0) \|\| + (LocaleCompare(extension,"wmz") == 0) \|\| + (LocaleCompare(extension,"svgz") == 0)) + { + blob_info->file_info.gzfile=gzopen(filename,"wb"); + if (blob_info->file_info.gzfile != (gzFile) NULL) + blob_info->type=ZipStream; } else -#if defined(MAGICKCORE_ZLIB_DELEGATE) - if ((LocaleCompare(extension,"Z") == 0) \|\| - (LocaleCompare(extension,"gz") == 0) \|\| - (LocaleCompare(extension,"wmz") == 0) \|\| - (LocaleCompare(extension,"svgz") == 0)) +#endif +#if defined(MAGICKCORE_BZLIB_DELEGATE) + if (LocaleCompare(extension,"bz2") == 0) { - blob_info->file_info.gzfile=gzopen(filename,"wb"); - if (blob_info->file_info.gzfile != (gzFile) NULL) - blob_info->type=ZipStream; + blob_info->file_info.bzfile=BZ2_bzopen(filename,"w"); + if (blob_info->file_info.bzfile != (BZFILE ) NULL) + blob_info->type=BZipStream; } else #endif -#if defined(MAGICKCORE_BZLIB_DELEGATE) - if (LocaleCompare(extension,"bz2") == 0) - { - blob_info->file_info.bzfile=BZ2_bzopen(filename,"w"); - if (blob_info->file_info.bzfile != (BZFILE ) NULL) - blob_info->type=BZipStream; - } - else -#endif - { - blob_info->file_info.file=(FILE ) fopen_utf8(filename,type); - if (blob_info->file_info.file != (FILE ) NULL) - { - blob_info->type=FileStream; - (void) SetStreamBuffering(image_info,image); - } - } + { + blob_info->file_info.file=(FILE ) fopen_utf8(filename,type); + if (blob_info->file_info.file != (FILE *) NULL) + { + blob_info->type=FileStream; + (void) SetStreamBuffering(image_info,blob_info); + } + } blob_info->status=MagickFalse; blob_info->error_number=MagickFalse; if (blob_info->type != UndefinedStream)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/color.c ^
@@ -865,6 +865,8 @@ } options=DestroyConfigureOptions(options); } +#else + magick_unreferenced(filename); #endif /* Load built-in color map.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/colorspace.c ^
@@ -134,8 +134,7 @@ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); colorspace=image->colorspace; type=IdentifyImageType(image,exception); - if ((type == BilevelType) \|\| (type == GrayscaleType) \|\| - (type == GrayscaleAlphaType)) + if (IsGrayImageType(type)) colorspace=GRAYColorspace; return(colorspace); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/configure.c ^
@@ -186,6 +186,9 @@ } options=DestroyConfigureOptions(options); } +#else + magick_unreferenced(filename); + magick_unreferenced(exception); #endif /* Load built-in configure.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/delegate.c ^
@@ -225,6 +225,8 @@ } options=DestroyConfigureOptions(options); } +#else + magick_unreferenced(filename); #endif if (IsLinkedListEmpty(cache) != MagickFalse) (void) LoadDelegateCache(cache,DelegateMap,"built-in",0,exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/draw.c ^
@@ -1383,10 +1383,11 @@ flags; flags=ParseGeometry(clone_info->density,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == MagickFalse) - resolution.y=resolution.x; + if ((flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } mid=(resolution.x/96.0)ExpandAffine(&clone_info->affine) clone_info->stroke_width/2.0;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/enhance.c ^
@@ -3637,9 +3637,9 @@ artifact; double - percent_brightness, - percent_hue, - percent_saturation; + percent_brightness = 100.0, + percent_hue = 100.0, + percent_saturation = 100.0; GeometryInfo geometry_info; @@ -3674,13 +3674,12 @@ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse) (void) SetImageColorspace(image,sRGBColorspace,exception); flags=ParseGeometry(modulate,&geometry_info); - percent_brightness=geometry_info.rho; - percent_saturation=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - percent_saturation=100.0; - percent_hue=geometry_info.xi; - if ((flags & XiValue) == 0) - percent_hue=100.0; + if ((flags & RhoValue) != 0) + percent_brightness=geometry_info.rho; + if ((flags & SigmaValue) != 0) + percent_saturation=geometry_info.sigma; + if ((flags & XiValue) != 0) + percent_hue=geometry_info.xi; artifact=GetImageArtifact(image,"modulate:colorspace"); if (artifact != (const char ) NULL) { @@ -4537,7 +4536,7 @@ channel_mask; double - black_point; + black_point = 0.0; GeometryInfo geometry_info; @@ -4549,7 +4548,8 @@ Level the a & b channels. / flags=ParseGeometry(artifact,&geometry_info); - black_point=geometry_info.rho; + if ((flags & RhoValue) != 0) + black_point=geometry_info.rho; if ((flags & PercentValue) != 0) black_point=(double) (QuantumRange/100.0); channel_mask=SetImageChannelMask(image,(ChannelType) (aChannel \|
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/fx.c ^
@@ -521,13 +521,16 @@ return(MagickFalse); } -static inline double FxGCD(const double alpha,const double beta) +static inline double FxGCD(const double alpha,const double beta, + const size_t depth) { - if (alpha < beta) - return(FxGCD(beta,alpha)); - if (fabs(beta) < 0.001) - return(alpha); - return(FxGCD(beta,alpha-betafloor(alpha/beta))); +#define FxMaxFunctionDepth 200 + + if (alpha < beta) + return(FxGCD(beta,alpha,depth+1)); + if ((fabs(beta) < 0.001) \|\| (depth >= FxMaxFunctionDepth)) + return(alpha); + return(FxGCD(beta,alpha-betafloor(alpha/beta),depth+1)); } static inline const char FxSubexpression(const char expression, @@ -2279,9 +2282,9 @@ alpha=FxEvaluateSubexpression(fx_info,channel,x,y,expression+3, depth+1,beta,exception); - if (IsNaN(alpha)) + if (IsNaN(alpha) != 0) FxReturn(alpha); - gcd=FxGCD(alpha,beta); + gcd=FxGCD(alpha,beta,0); FxReturn(gcd); } if (LocaleCompare(expression,"g") == 0)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/image.c ^
@@ -293,8 +293,7 @@ geometry_info.sigma+0.5)); } else - image->delay=(size_t) CastDoubleToLong(floor( - geometry_info.rho+0.5)); + image->delay=(size_t) CastDoubleToLong(floor(geometry_info.rho+0.5)); if ((flags & SigmaValue) != 0) image->ticks_per_second=CastDoubleToLong(floor( geometry_info.sigma+0.5)); @@ -4052,10 +4051,11 @@ if (option != (const char ) NULL) { flags=ParseGeometry(option,&geometry_info); - image->chromaticity.blue_primary.x=geometry_info.rho; - image->chromaticity.blue_primary.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->chromaticity.blue_primary.y=image->chromaticity.blue_primary.x; + if ((flags & RhoValue) != 0) + image->chromaticity.blue_primary.x=geometry_info.rho; + image->chromaticity.blue_primary.y=image->chromaticity.blue_primary.x; + if ((flags & SigmaValue) != 0) + image->chromaticity.blue_primary.y=geometry_info.sigma; } option=GetImageOption(image_info,"bordercolor"); if (option != (const char ) NULL) @@ -4079,10 +4079,11 @@ if (option != (const char ) NULL) { flags=ParseGeometry(option,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } option=GetImageOption(image_info,"depth"); if (option != (const char ) NULL) @@ -4106,10 +4107,11 @@ if (option != (const char ) NULL) { flags=ParseGeometry(option,&geometry_info); - image->chromaticity.green_primary.x=geometry_info.rho; - image->chromaticity.green_primary.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->chromaticity.green_primary.y=image->chromaticity.green_primary.x; + if ((flags & RhoValue) != 0) + image->chromaticity.green_primary.x=geometry_info.rho; + image->chromaticity.green_primary.y=image->chromaticity.green_primary.x; + if ((flags & SigmaValue) != 0) + image->chromaticity.green_primary.y=geometry_info.sigma; } option=GetImageOption(image_info,"intent"); if (option != (const char ) NULL) @@ -4155,10 +4157,11 @@ if (option != (const char ) NULL) { flags=ParseGeometry(option,&geometry_info); - image->chromaticity.red_primary.x=geometry_info.rho; - image->chromaticity.red_primary.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->chromaticity.red_primary.y=image->chromaticity.red_primary.x; + if ((flags & RhoValue) != 0) + image->chromaticity.red_primary.x=geometry_info.rho; + image->chromaticity.red_primary.y=image->chromaticity.red_primary.x; + if ((flags & SigmaValue) != 0) + image->chromaticity.red_primary.y=geometry_info.sigma; } if (image_info->quality != UndefinedCompressionQuality) image->quality=image_info->quality; @@ -4225,10 +4228,11 @@ if (option != (const char ) NULL) { flags=ParseGeometry(option,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } } option=GetImageOption(image_info,"virtual-pixel"); @@ -4240,10 +4244,11 @@ if (option != (const char ) NULL) { flags=ParseGeometry(option,&geometry_info); - image->chromaticity.white_point.x=geometry_info.rho; - image->chromaticity.white_point.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->chromaticity.white_point.y=image->chromaticity.white_point.x; + if ((flags & RhoValue) != 0) + image->chromaticity.white_point.x=geometry_info.rho; + image->chromaticity.white_point.y=image->chromaticity.white_point.x; + if ((flags & SigmaValue) != 0) + image->chromaticity.white_point.y=geometry_info.sigma; } / Pointer to allow the lookup of pre-image artifact will fallback to a global
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/locale.c ^
@@ -222,6 +222,8 @@ options=DestroyLocaleOptions(options); } } +#else + magick_unreferenced(filename); #endif if (GetNumberOfNodesInSplayTree(cache) == 0) (void) LoadLocaleCache(cache,LocaleMap,"built-in",locale,0,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/log.c ^
@@ -299,6 +299,8 @@ } options=DestroyConfigureOptions(options); } +#else + magick_unreferenced(filename); #endif /* Load built-in log map.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/magick-type.h ^
@@ -151,10 +151,6 @@ typedef MagickSizeType QuantumAny; -#if defined(macintosh) -#define ExceptionInfo MagickExceptionInfo -#endif - typedef enum { UndefinedClass,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/magick.c ^
@@ -1136,9 +1136,7 @@ MagickPrivate MagickBooleanType IsMagickConflict(const char magick) { assert(magick != (char ) NULL); -#if defined(macintosh) - return(MACIsMagickConflict(magick)); -#elif defined(vms) +#if defined(vms) return(VMSIsMagickConflict(magick)); #elif defined(MAGICKCORE_WINDOWS_SUPPORT) return(NTIsMagickConflict(magick));
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/mime.c ^
@@ -177,6 +177,9 @@ } options=DestroyConfigureOptions(options); } +#else + magick_unreferenced(filename); + magick_unreferenced(exception); #endif return(cache); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/nt-base-private.h ^
@@ -67,12 +67,6 @@ #endif -#if defined(MAGICKCORE_BZLIB_DELEGATE) -# if defined(_WIN32) -# define BZ_IMPORT 1 -# endif -#endif - extern MagickPrivate char *NTGetLastError(void);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/opencl.c ^
@@ -936,15 +936,13 @@ static MagickBooleanType LoadOpenCLBenchmarks(MagickCLEnv clEnv) { +#if !MAGICKCORE_ZERO_CONFIGURATION_SUPPORT char filename[MagickPathExtent]; StringInfo option; - size_t - i; - (void) FormatLocaleString(filename,MagickPathExtent,"%s%s%s", GetOpenCLCacheDirectory(),DirectorySeparator,IMAGEMAGICK_PROFILE_FILE); @@ -952,21 +950,24 @@ We don't run the benchmark when we can not write out a device profile. The first GPU device will be used. / -#if !MAGICKCORE_ZERO_CONFIGURATION_SUPPORT if (CanWriteProfileToFile(filename) == MagickFalse) #endif { + size_t + i; + for (i = 0; i < clEnv->number_devices; i++) clEnv->devices[i]->score=1.0; SelectOpenCLDevice(clEnv,CL_DEVICE_TYPE_GPU); return(MagickFalse); } - +#if !MAGICKCORE_ZERO_CONFIGURATION_SUPPORT option=ConfigureFileToStringInfo(filename); LoadOpenCLDeviceBenchmark(clEnv,(const char *) GetStringInfoDatum(option)); option=DestroyStringInfo(option); return(MagickTrue); +#endif } static void AutoSelectOpenCLDevices(MagickCLEnv clEnv)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/option.c ^
@@ -826,8 +826,8 @@ { "-green-primary", 1L, ImageInfoOptionFlag, MagickFalse }, { "+hald-clut", 0L, DeprecateOptionFlag \| FireOptionFlag, MagickTrue }, { "-hald-clut", 0L, ListOperatorFlag \| FireOptionFlag, MagickFalse }, - { "+highlight-color", 0L, NonMagickOptionFlag \| ImageInfoOptionFlag, MagickFalse }, - { "-highlight-color", 1L, NonMagickOptionFlag \| ImageInfoOptionFlag, MagickFalse }, + { "+highlight-color", 0L, ImageInfoOptionFlag, MagickFalse }, + { "-highlight-color", 1L, ImageInfoOptionFlag, MagickFalse }, { "+hough-lines", 1L, DeprecateOptionFlag, MagickTrue }, { "-hough-lines", 1L, SimpleOperatorFlag, MagickTrue }, { "+iconGeometry", 0L, NonMagickOptionFlag, MagickFalse }, @@ -889,8 +889,8 @@ { "-log", 1L, GlobalOptionFlag, MagickFalse }, { "+loop", 0L, ImageInfoOptionFlag, MagickFalse }, { "-loop", 1L, ImageInfoOptionFlag, MagickFalse }, - { "+lowlight-color", 0L, NonMagickOptionFlag \| ImageInfoOptionFlag, MagickFalse }, - { "-lowlight-color", 1L, NonMagickOptionFlag \| ImageInfoOptionFlag, MagickFalse }, + { "+lowlight-color", 0L, ImageInfoOptionFlag, MagickFalse }, + { "-lowlight-color", 1L, ImageInfoOptionFlag, MagickFalse }, { "+magnify", 0L, DeprecateOptionFlag, MagickTrue }, { "-magnify", 0L, SimpleOperatorFlag, MagickFalse }, { "+map", 0L, ReplacedOptionFlag \| ListOperatorFlag \| FireOptionFlag, MagickTrue },
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/property.c ^
@@ -3643,7 +3643,7 @@ (void) SetImageBackgroundColor(property_image,exception); } interpret_text=AcquireString(embed_text); /* new string with extra space / - extent=MagickPathExtent; / allocated space in string / + extent=MagickPathExtent; / allocated space in string / number=MagickFalse; / is last char a number? / for (q=interpret_text; p!='\0'; number=isdigit((int) ((unsigned char) *p)) ? MagickTrue : MagickFalse,p++) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/quantize.c ^
@@ -3114,7 +3114,7 @@ maximum_colors=MaxColormapSize; if (maximum_colors > MaxColormapSize) maximum_colors=MaxColormapSize; - type=IdentifyImageType(image,exception); + type=IdentifyImageGray(image,exception); if (IsGrayImageType(type) != MagickFalse) (void) SetGrayscaleImage(image,exception); depth=quantize_info->tree_depth;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/studio.h ^
@@ -226,13 +226,6 @@ #else # include <types.h> # include <stat.h> -# if defined(macintosh) -# if !defined(DISABLE_SIOUX) -# include <SIOUX.h> -# include <console.h> -# endif -# include <unix.h> -# endif # include "MagickCore/magick-type.h" #endif
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/type.c ^
@@ -238,6 +238,8 @@ font_path=DestroyString(font_path); } } +#else + magick_unreferenced(filename); #endif if (GetNumberOfNodesInSplayTree(cache) == 0) (void) LoadTypeCache(cache,TypeMap,"built-in",0,exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/utility-private.h ^
@@ -88,7 +88,8 @@ longPath=(wchar_t ) RelinquishMagickMemory(longPath); if ((count < 5) \|\| (count >= MAX_PATH)) return((wchar_t ) NULL); - wideChar=(wchar_t ) AcquireQuantumMemory(count-3,sizeof(wideChar)); + wideChar=(wchar_t ) AcquireQuantumMemory((size_t) count-3, + sizeof(wideChar)); wcscpy(wideChar,shortPath+4); return(wideChar); } @@ -103,6 +104,31 @@ } return(wideChar); } + +static inline wchar_t create_wchar_mode(const char mode) +{ + int + count; + + wchar_t + wideChar; + + count=MultiByteToWideChar(CP_UTF8,0,mode,-1,NULL,0); + wideChar=(wchar_t ) AcquireQuantumMemory((size_t) count+1, + sizeof(wideChar)); + if (wideChar == (wchar_t ) NULL) + return((wchar_t ) NULL); + count=MultiByteToWideChar(CP_UTF8,0,mode,-1,wideChar,count); + if (count == 0) + { + wideChar=(wchar_t ) RelinquishMagickMemory(wideChar); + return((wchar_t ) NULL); + } + / Specifies that the file is not inherited by child processes / + wideChar[count] = L'\0'; + wideChar[count-1] = L'N'; + return(wideChar); +} #endif static inline int access_utf8(const char path,int mode) @@ -140,7 +166,7 @@ path_wide=create_wchar_path(path); if (path_wide == (wchar_t ) NULL) return((FILE ) NULL); - mode_wide=create_wchar_path(mode); + mode_wide=create_wchar_mode(mode); if (mode_wide == (wchar_t ) NULL) { path_wide=(wchar_t ) RelinquishMagickMemory(path_wide); @@ -180,18 +206,19 @@ #if !defined(MAGICKCORE_WINDOWS_SUPPORT) \|\| defined(__CYGWIN__) return(open(path,flags,mode)); #else - int - status; + int + status; - wchar_t - path_wide; + wchar_t + path_wide; - path_wide=create_wchar_path(path); - if (path_wide == (wchar_t ) NULL) - return(-1); - status=_wopen(path_wide,flags,mode); - path_wide=(wchar_t ) RelinquishMagickMemory(path_wide); - return(status); + path_wide=create_wchar_path(path); + if (path_wide == (wchar_t ) NULL) + return(-1); + / O_NOINHERIT specifies that the file is not inherited by child processes / + status=_wopen(path_wide,flags \| O_NOINHERIT,mode); + path_wide=(wchar_t ) RelinquishMagickMemory(path_wide); + return(status); #endif }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/vision.c ^
@@ -1424,11 +1424,14 @@ } for (x=0; x < (ssize_t) bounding_box.width; x++) { + size_t + k; + if (status == MagickFalse) continue; j=(ssize_t) GetPixelIndex(component_image,p); if (j == i) - for (n=0; n < (ssize_t) (connectivity > 4 ? 4 : 2); n++) + for (k=0; k < (ssize_t) (connectivity > 4 ? 4 : 2); k++) { const Quantum q; @@ -1438,8 +1441,8 @@ / if (status == MagickFalse) continue; - dx=connectivity > 4 ? connect8[n][1] : connect4[n][1]; - dy=connectivity > 4 ? connect8[n][0] : connect4[n][0]; + dx=connectivity > 4 ? connect8[k][1] : connect4[k][1]; + dy=connectivity > 4 ? connect8[k][0] : connect4[k][0]; q=GetCacheViewVirtualPixels(object_view,bounding_box.x+x+dx, bounding_box.y+y+dy,1,1,exception); if (q == (const Quantum *) NULL)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickCore/xwindow.c ^
@@ -3199,13 +3199,14 @@ Initialize map relative to display and image gamma. / flags=ParseGeometry(resource_info->display_gamma,&geometry_info); - red_gamma=geometry_info.rho; - green_gamma=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - green_gamma=red_gamma; - blue_gamma=geometry_info.xi; - if ((flags & XiValue) == 0) - blue_gamma=red_gamma; + if ((flags & RhoValue) != 0) + red_gamma=geometry_info.rho; + green_gamma=red_gamma; + if ((flags & SigmaValue) != 0) + green_gamma=geometry_info.sigma; + blue_gamma=red_gamma; + if ((flags & XiValue) != 0) + blue_gamma=geometry_info.xi; red_gamma=image->gamma; green_gamma=image->gamma; blue_gamma=image->gamma;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickWand/MagickWand.h ^
@@ -25,7 +25,7 @@ #if !defined(MAGICKWAND_CONFIG_H) # define MAGICKWAND_CONFIG_H -# if !defined(vms) && !defined(macintosh) +# if !defined(vms) # include "MagickCore/magick-config.h" # else # include "magick-config.h"
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickWand/identify.c ^
@@ -100,6 +100,7 @@ " -log format format of debugging information\n" " -version print version information", operators[] = + " -auto-orient automagically orient (rotate) image\n" " -channel mask set the image channel mask\n" " -grayscale method convert image to grayscale\n" " -negate replace every pixel with its complementary color", @@ -371,6 +372,8 @@ ThrowIdentifyException(OptionError,"MissingArgument",option); break; } + if (LocaleCompare("auto-orient",option+1) == 0) + break; ThrowIdentifyException(OptionError,"UnrecognizedOption",option) } case 'c':
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/MagickWand/studio.h ^
@@ -210,13 +210,6 @@ #else # include <types.h> # include <stat.h> -# if defined(macintosh) -# if !defined(DISABLE_SIOUX) -# include <SIOUX.h> -# include <console.h> -# endif -# include <unix.h> -# endif #endif #if defined(S_IRUSR) && defined(S_IWUSR)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/Makefile.in ^
@@ -3193,6 +3193,7 @@ JBIG_LIBS = @JBIG_LIBS@ JEMALLOC_LIBS = @JEMALLOC_LIBS@ JPEG_LIBS = @JPEG_LIBS@ +JXL_CFLAGS = @JXL_CFLAGS@ JXL_LIBS = @JXL_LIBS@ JXRDecodeDelegate = @JXRDecodeDelegate@ JXREncodeDelegate = @JXREncodeDelegate@
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/PerlMagick/Makefile.PL.in ^
@@ -34,8 +34,8 @@ my @libdir = ($wrkdir); my @bindir = (); - #try to get configuration info via identify or convert utilities - my $conf = `identify -list Configure 2>$devnull` \|\| `convert -list Configure 2>$devnull`; + #try to get configuration info via magick or identify utilities + my $conf = `magick identify -list Configure 2>$devnull` \|\| `identify -list Configure 2>$devnull`; foreach my $line (split '\n', $conf) { if ($line =~ /^Path:\s+(.*)/) { my ($vol,$dir,$file) = splitpath($1); @@ -59,7 +59,7 @@ push @b, catfile($dirpath,'..','..','bin'); push @b, catfile($dirpath,'..','..','..'); push @b, catfile($dirpath,'..','..','..','bin'); - foreach (@b) { push @bindir, $_ if (-e "$_/convert.exe" \|\| -e "$_/identify.exe") }; + foreach (@b) { push @bindir, $_ if (-e "$_/magick.exe" \|\| -e "$_/identify.exe") }; # try to detect 'include' dir push @i, catfile($dirpath,'include'); @@ -109,8 +109,8 @@ # 3) During installation select that you want to install ImageMagick's # development files (libraries+headers) # -# 4) You also need to have ImageMagick's directory in your PATH -# note: we are checking the presence of convert.exe and/or identify.exe tools +# 4) You NEED TO have ImageMagick's directory in your PATH. We are +# using the 'magick' tool to determine your actual configuration. # # 5) You might need Visual C++ Redistributable Package installed on your system # see instructions on ImageMagick's Binary Release webpage @@ -127,9 +127,9 @@ } sub AutodetectDelegates { - #try to get configuration info via identify or convert utilities + #try to get configuration info via magick or identify utilities my $devnull = devnull(); - my $conf = `identify -list Configure 2>$devnull` \|\| `convert -list Configure 2>$devnull`; + my $conf = `magick identify -list Configure 2>$devnull` \|\| `identify -list Configure 2>$devnull`; my @delegates = (); foreach my $line (split '\n', $conf) { next unless $line =~ /^DELEGATES\s+/;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/PerlMagick/README.txt ^
@@ -90,8 +90,8 @@ 3) During installation select that you want to install ImageMagick's development files (libraries+headers) - 4) You NEED TO have ImageMagick's directory in your PATH. Note: we are - checking the presence of convert.exe or identify.exe tools + 4) You also need to have ImageMagick's directory in your PATH. We are + using the 'magick' tool to determine your actual configuration. 5) You might need Visual C++ Redistributable Package installed on your system. See instructions on ImageMagick's Binary Release webpage.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/bmp.c ^
@@ -1566,6 +1566,7 @@ entry->magick=(IsImageFormatHandler ) IsBMP; entry->flags^=CoderAdjoinFlag; entry->flags\|=CoderDecoderSeekableStreamFlag; + entry->mime_type=ConstantString("image/bmp"); (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("BMP","BMP2","Microsoft Windows bitmap image (V2)"); entry->decoder=(DecodeImageHandler ) ReadBMPImage; @@ -1573,6 +1574,7 @@ entry->magick=(IsImageFormatHandler ) IsBMP; entry->flags^=CoderAdjoinFlag; entry->flags\|=CoderDecoderSeekableStreamFlag; + entry->mime_type=ConstantString("image/bmp"); (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("BMP","BMP3","Microsoft Windows bitmap image (V3)"); entry->decoder=(DecodeImageHandler ) ReadBMPImage; @@ -1580,6 +1582,7 @@ entry->magick=(IsImageFormatHandler *) IsBMP; entry->flags^=CoderAdjoinFlag; entry->flags\|=CoderDecoderSeekableStreamFlag; + entry->mime_type=ConstantString("image/bmp"); (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/bytebuffer-private.h ^
@@ -57,7 +57,8 @@ result; result=PeekMagickByteBuffer(buffer); - buffer->offset++; + if (result != EOF) + buffer->offset++; return(result); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/caption.c ^
@@ -94,17 +94,14 @@ static inline void AdjustTypeMetricBounds(TypeMetric metrics) { - double - x1; - if (metrics->bounds.x1 >= 0.0) + metrics->bounds.x1=0.0; + else { - metrics->bounds.x1=0.0; - return; + double x1 = ceil(-metrics->bounds.x1+0.5); + metrics->width+=x1+x1; + metrics->bounds.x1=x1; } - x1=ceil(-metrics->bounds.x1+0.5); - metrics->width+=x1+x1; - metrics->bounds.x1=x1; } static Image ReadCAPTIONImage(const ImageInfo image_info, @@ -245,6 +242,7 @@ / Auto fit text into bounding box. / + low=1.0; option=GetImageOption(image_info,"caption:max-pointsize"); if (option != (const char) NULL) { @@ -255,6 +253,13 @@ } else { + option=GetImageOption(image_info,"caption:start-pointsize"); + if (option != (const char ) NULL) + { + draw_info->pointsize=StringToDouble(option,(char) NULL); + if (draw_info->pointsize < 1.0) + draw_info->pointsize=1.0; + } for (n=0; n < 32; n++, draw_info->pointsize=2.0) { text=AcquireString(caption); @@ -276,8 +281,10 @@ draw_info->stroke_width+0.5); if ((image->columns != 0) && (image->rows != 0)) { - if ((width >= image->columns) && (height >= image->rows)) + if ((width >= image->columns) \|\| (height >= image->rows)) break; + if ((width < image->columns) && (height < image->rows)) + low=draw_info->pointsize; } else if (((image->columns != 0) && (width >= image->columns)) \|\| @@ -286,12 +293,11 @@ } high=draw_info->pointsize; } - for (low=1.0; (high-low) > 0.5; ) + while ((high-low) > 0.5) { draw_info->pointsize=(low+high)/2.0; text=AcquireString(caption); - i=FormatMagickCaption(image,draw_info,split,&metrics,&text, - exception); + i=FormatMagickCaption(image,draw_info,split,&metrics,&text,exception); AdjustTypeMetricBounds(&metrics); (void) CloneString(&draw_info->text,text); text=DestroyString(text);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/coders-private.h ^
@@ -17,6 +17,7 @@ #define MAGICK_CODERS_PRIVATE_H #include "MagickCore/attribute.h" +#include "MagickCore/colorspace-private.h" #include "MagickCore/property.h" #include "MagickCore/string_.h" @@ -37,16 +38,32 @@ const char value; + value=GetImageProperty(image,"colorspace:auto-grayscale",exception); + if (IsStringFalse(value) != MagickFalse) + return(image->type); + return(IdentifyImageType(image,exception)); +} + +static inline ImageType IdentifyImageCoderGrayType(const Image image, + ExceptionInfo exception) +{ + const char + value; + + value=GetImageProperty(image,"colorspace:auto-grayscale",exception); + if (IsStringFalse(value) != MagickFalse) + return(UndefinedType); + return(IdentifyImageGray(image,exception)); +} + +static inline MagickBooleanType IdentifyImageCoderGray(const Image image, + ExceptionInfo exception) +{ ImageType type; - type=IdentifyImageType(image,exception); - if ((type != GrayscaleType) && (type != BilevelType)) - return(type); - value=GetImageProperty(image,"colorspace:auto-grayscale",exception); - if (IsStringFalse(value) == MagickFalse) - return(type); - return(TrueColorType); + type=IdentifyImageCoderGrayType(image,exception); + return(IsGrayImageType(type)); } #endif
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/cut.c ^
@@ -609,27 +609,24 @@ (void) SyncImage(image,exception); - /detect monochrome image/ - - if(palette==NULL) - { /attempt to detect binary (black&white) images/ - ImageType - type; - - type=IdentifyImageCoderType(image,exception); + /* detect monochrome image / + if (palette == (Image ) NULL) + { + /* attempt to detect binary (black&white) images */ if ((image->storage_class == PseudoClass) && - (IsGrayImageType(type) != MagickFalse)) + (IdentifyImageCoderGray(image,exception) != MagickFalse)) { - if(GetCutColors(image,exception)==2) + if (GetCutColors(image,exception) == 2) { for (i=0; i < (ssize_t)image->colors; i++) { Quantum sample; + sample=ScaleCharToQuantum((unsigned char) i); - if(image->colormap[i].red!=sample) goto Finish; - if(image->colormap[i].green!=sample) goto Finish; - if(image->colormap[i].blue!=sample) goto Finish; + if (image->colormap[i].red!=sample) goto Finish; + if (image->colormap[i].green!=sample) goto Finish; + if (image->colormap[i].blue!=sample) goto Finish; } image->colormap[1].red=image->colormap[1].green=
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/dcm.c ^
@@ -2709,6 +2709,7 @@ mask, max_value, samples_per_pixel, + scale_size, signed_data, significant_bits, width, @@ -2746,6 +2747,15 @@ byte; } DCMStreamInfo; +typedef struct _DCMMap +{ + int + blue, + green, + gray, + red; +} DCMMap; + static int ReadDCMByte(DCMStreamInfo stream_info,Image image) { if (image->compression != RLECompression) @@ -3002,29 +3012,46 @@ return(status); } +static void RelinquishDCMInfo(void memory) +{ + DCMInfo + info; + + info=(DCMInfo ) memory; + if (info->scale != (Quantum ) NULL) + info->scale=(Quantum ) RelinquishMagickMemory(info->scale); + return(RelinquishMagickMemory(info)); +} + +static inline void RelinquishDCMMemory(DCMInfo info,DCMMap map, + DCMStreamInfo stream_info,LinkedListInfo stack,unsigned char data) +{ + if (info->scale != (Quantum ) NULL) + info->scale=(Quantum ) RelinquishMagickMemory(info->scale); + if (map->gray != (int ) NULL) + map->gray=(int ) RelinquishMagickMemory(map->gray); + if (map->blue != (int ) NULL) + map->blue=(int ) RelinquishMagickMemory(map->blue); + if (map->green != (int ) NULL) + map->green=(int ) RelinquishMagickMemory(map->green); + if (map->red != (int ) NULL) + map->red=(int ) RelinquishMagickMemory(map->red); + if (stream_info->offsets != (ssize_t ) NULL) + stream_info->offsets=(ssize_t ) RelinquishMagickMemory( + stream_info->offsets); + if (stream_info != (DCMStreamInfo ) NULL) + stream_info=(DCMStreamInfo ) RelinquishMagickMemory(stream_info); + if (stack != (LinkedListInfo ) NULL) + stack=DestroyLinkedList(stack,RelinquishDCMInfo); + if (data != (unsigned char ) NULL) + data=(unsigned char ) RelinquishMagickMemory(data); +} + static Image ReadDCMImage(const ImageInfo image_info,ExceptionInfo exception) { #define ThrowDCMException(exception,message) \ { \ - if (info.scale != (Quantum ) NULL) \ - info.scale=(Quantum ) RelinquishMagickMemory(info.scale); \ - if (data != (unsigned char ) NULL) \ - data=(unsigned char ) RelinquishMagickMemory(data); \ - if (graymap != (int ) NULL) \ - graymap=(int ) RelinquishMagickMemory(graymap); \ - if (bluemap != (int ) NULL) \ - bluemap=(int ) RelinquishMagickMemory(bluemap); \ - if (greenmap != (int ) NULL) \ - greenmap=(int ) RelinquishMagickMemory(greenmap); \ - if (redmap != (int ) NULL) \ - redmap=(int ) RelinquishMagickMemory(redmap); \ - if (stream_info->offsets != (ssize_t ) NULL) \ - stream_info->offsets=(ssize_t ) RelinquishMagickMemory( \ - stream_info->offsets); \ - if (stream_info != (DCMStreamInfo ) NULL) \ - stream_info=(DCMStreamInfo ) RelinquishMagickMemory(stream_info); \ - if (stack != (LinkedListInfo ) NULL) \ - stack=DestroyLinkedList(stack,RelinquishMagickMemory); \ + RelinquishDCMMemory(&info,&map,stream_info,stack,data); \ ThrowReaderException((exception),(message)); \ } @@ -3038,6 +3065,9 @@ info, info_copy; + DCMMap + map; + DCMStreamInfo stream_info; @@ -3045,11 +3075,7 @@ image; int - bluemap, - datum, - greenmap, - graymap, - redmap; + datum; LinkedListInfo stack; @@ -3111,11 +3137,8 @@ Read DCM preamble. / (void) memset(&info,0,sizeof(info)); + (void) memset(&map,0,sizeof(map)); data=(unsigned char ) NULL; - graymap=(int ) NULL; - redmap=(int ) NULL; - greenmap=(int ) NULL; - bluemap=(int ) NULL; stream_info=(DCMStreamInfo ) AcquireMagickMemory(sizeof(stream_info)); sequence_depth=0; stack=NewLinkedList(256); @@ -3144,15 +3167,10 @@ info.samples_per_pixel=1; info.signed_data=(~0UL); info.rescale_slope=1.0; - data=(unsigned char ) NULL; element=0; explicit_vr[2]='\0'; explicit_file=MagickFalse; colors=0; - redmap=(int ) NULL; - greenmap=(int ) NULL; - bluemap=(int ) NULL; - graymap=(int ) NULL; number_scenes=1; use_explicit=MagickFalse; explicit_retry=MagickFalse; @@ -3221,14 +3239,13 @@ quantum=4; } } - - / - If we're exiting a sequence, restore the previous image parameters, - effectively undoing any parameter changes that happened inside the - sequence. - / if ((group == 0xFFFE) && (element == 0xE0DD)) { + / + If we're exiting a sequence, restore the previous image parameters, + effectively undoing any parameter changes that happened inside the + sequence. + / sequence_depth--; info_copy=(DCMInfo ) RemoveLastElementFromLinkedList(stack); if (info_copy == (DCMInfo )NULL) @@ -3239,22 +3256,33 @@ / ThrowDCMException(CorruptImageError,"ImproperImageHeader"); } - memcpy(&info,info_copy,sizeof(info)); - RelinquishMagickMemory(info_copy); + if (info.scale != (Quantum ) NULL) + info.scale=(Quantum ) RelinquishMagickMemory(info.scale); + (void) memcpy(&info,info_copy,sizeof(info)); + info_copy=(DCMInfo ) RelinquishMagickMemory(info_copy); } - - / - If we're entering a sequence, push the current image parameters onto - the stack, so we can restore them at the end of the sequence. - / if (strcmp(explicit_vr,"SQ") == 0) { + / + If we're entering a sequence, push the current image parameters + onto the stack, so we can restore them at the end of the sequence. + / info_copy=(DCMInfo ) AcquireMagickMemory(sizeof(info)); - memcpy(info_copy,&info,sizeof(info)); + if (info_copy == (DCMInfo ) NULL) + ThrowDCMException(ResourceLimitError,"MemoryAllocationFailed"); + (void) memcpy(info_copy,&info,sizeof(info)); + info_copy->scale=(Quantum ) AcquireQuantumMemory( + info_copy->scale_size,sizeof(info_copy->scale)); + if (info_copy->scale == (Quantum ) NULL) + { + info_copy=(DCMInfo ) RelinquishMagickMemory(info_copy); + ThrowDCMException(ResourceLimitError,"MemoryAllocationFailed"); + } + (void) memcpy(info_copy->scale,info.scale,info_copy->scale_size + sizeof(*info_copy->scale)); AppendValueToLinkedList(stack,info_copy); sequence_depth++;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/dds.c ^
@@ -2146,15 +2146,28 @@ /* Write the pixels / for (i=0; i < 16; i++) { + unsigned char + c2; + c0=2 subset_indices[i]; c1=(2 * subset_indices[i]) + 1; + c2=color_indices[i]; + weight=64; /* Color Interpolation / switch(index_prec) { - case 2: weight=BC7_weight2[color_indices[i]]; break; - case 3: weight=BC7_weight3[color_indices[i]]; break; - default: weight=BC7_weight4[color_indices[i]]; + case 2: + if (c2 < sizeof(BC7_weight2)) + weight=BC7_weight2[c2]; + break; + case 3: + if (c2 < sizeof(BC7_weight3)) + weight=BC7_weight3[c2]; + break; + default: + if (c2 < sizeof(BC7_weight4)) + weight=BC7_weight4[c2]; } r=((64 - weight) colors.r[c0] + weight * colors.r[c1] + 32) >> 6; g=((64 - weight) * colors.g[c0] + weight * colors.g[c1] + 32) >> 6; @@ -2164,10 +2177,16 @@ /* Interpolate alpha for mode 4 and 5 blocks / if (mode == 4 \|\| mode == 5) { - weight=BC7_weight2[alpha_indices[i]]; - if (mode == 4 && selector_bit == 0) - weight=BC7_weight3[alpha_indices[i]]; - a=((64 - weight) colors.a[c0] + weight * colors.a[c1] + 32) >> 6; + unsigned char + a0; + + a0=alpha_indices[i]; + if (a0 < sizeof(BC7_weight2)) + weight=BC7_weight2[a0]; + if ((mode == 4) && (selector_bit == 0) && (a0 < sizeof(BC7_weight3))) + weight=BC7_weight3[a0]; + if ((c0 < sizeof(colors.a)) && (c1 < sizeof(colors.a))) + a=((64 - weight) * colors.a[c0] + weight * colors.a[c1] + 32) >> 6; } switch (rotation) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/dng.c ^
@@ -341,6 +341,18 @@ if (raw_info->params.output_color == 5) image->colorspace=XYZColorspace; } + option=GetImageOption(image_info,"dng:interpolation-quality"); + if (option != (const char ) NULL) + { + int + value; + + value=StringToInteger(option); + if (value == -1) + raw_info->params.no_interpolation=1; + else + raw_info->params.user_qual=value; + } } static void LibRawDataError(void data,const char *magick_unused(file),
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/dpx.c ^
@@ -1526,10 +1526,11 @@ if (image_info->sampling_factor != (char *) NULL) { flags=ParseGeometry(image_info->sampling_factor,&geometry_info); - horizontal_factor=(ssize_t) geometry_info.rho; - vertical_factor=(ssize_t) geometry_info.sigma; - if ((flags & SigmaValue) == 0) - vertical_factor=horizontal_factor; + if ((flags & RhoValue) != 0) + horizontal_factor=(ssize_t) geometry_info.rho; + vertical_factor=horizontal_factor; + if ((flags & SigmaValue) != 0) + vertical_factor=(ssize_t) geometry_info.sigma; if ((horizontal_factor != 1) && (horizontal_factor != 2) && (horizontal_factor != 4) && (vertical_factor != 1) && (vertical_factor != 2) && (vertical_factor != 4)) @@ -1666,18 +1667,12 @@ } default: { - ImageType - type; - dpx.image.image_element[i].descriptor=RGBComponentType; if (image->alpha_trait != UndefinedPixelTrait) dpx.image.image_element[i].descriptor=RGBAComponentType; - type=UndefinedType; - if (image_info->type != TrueColorType) - type=IdentifyImageCoderType(image,exception); if ((image_info->type != TrueColorType) && (image->alpha_trait == UndefinedPixelTrait) && - (IsGrayImageType(type) != MagickFalse)) + (IdentifyImageCoderGray(image,exception) != MagickFalse)) dpx.image.image_element[i].descriptor=LumaComponentType; break; }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/emf.c ^
@@ -747,10 +747,11 @@ else if (image_info->density != (char *) NULL) { flags=ParseGeometry(image_info->density,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; EMFSetDimensions(image,source); } if (SetImageExtent(image,image->columns,image->rows,exception) == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/fits.c ^
@@ -639,10 +639,8 @@ const Quantum p; - ImageType - type; - MagickBooleanType + is_gray, status; QuantumInfo @@ -703,9 +701,9 @@ image->depth)); CopyFitsRecord(fits_info,header,offset); offset+=80; - type=IdentifyImageCoderType(image,exception); + is_gray=IdentifyImageCoderGray(image,exception); (void) FormatLocaleString(header,FITSBlocksize,"NAXIS = %10lu", - (type == GrayscaleType) \|\| (type == BilevelType) ? 2UL : 3UL); + (is_gray != MagickFalse) ? 2UL : 3UL); CopyFitsRecord(fits_info,header,offset); offset+=80; (void) FormatLocaleString(header,FITSBlocksize,"NAXIS1 = %10lu", @@ -716,7 +714,7 @@ (unsigned long) image->rows); CopyFitsRecord(fits_info,header,offset); offset+=80; - if ((type != GrayscaleType) && (type != BilevelType)) + if (is_gray == MagickFalse) { (void) FormatLocaleString(header,FITSBlocksize, "NAXIS3 = %10lu",3UL); @@ -755,7 +753,7 @@ Convert image to fits scale PseudoColor class. / pixels=(unsigned char *) GetQuantumPixels(quantum_info); - if (IsGrayImageType(type) != MagickFalse) + if (is_gray != MagickFalse) { length=GetQuantumExtent(image,quantum_info,GrayQuantum); for (y=(ssize_t) image->rows-1; y >= 0; y--)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/fpx.c ^
@@ -71,7 +71,7 @@ #include "MagickCore/string_.h" #include "coders/coders-private.h" #if defined(MAGICKCORE_FPX_DELEGATE) -#if !defined(vms) && !defined(macintosh) && !defined(MAGICKCORE_WINDOWS_SUPPORT) +#if !defined(vms) && !defined(MAGICKCORE_WINDOWS_SUPPORT) #include <fpxlib.h> #else #include "Fpxlib.h" @@ -213,18 +213,8 @@ tile_width=64; tile_height=64; flashpix=(FPXImageHandle ) NULL; - { -#if defined(macintosh) - FSSpec - fsspec; - - FilenameToFSSpec(image->filename,&fsspec); - fpx_status=FPX_OpenImageByFilename((const FSSpec &) fsspec,(char ) NULL, -#else - fpx_status=FPX_OpenImageByFilename(image->filename,(char ) NULL, -#endif - &width,&height,&tile_width,&tile_height,&colorspace,&flashpix); - } + fpx_status=FPX_OpenImageByFilename(image->filename,(char ) NULL,&width, + &height,&tile_width,&tile_height,&colorspace,&flashpix); if (fpx_status == FPX_LOW_MEMORY_ERROR) { FPX_ClearSystem(); @@ -785,9 +775,6 @@ FPXSummaryInformation summary_info; - ImageType - type; - MagickBooleanType status; @@ -844,10 +831,8 @@ colorspace.numberOfComponents=3; if (image->alpha_trait != UndefinedPixelTrait) colorspace.numberOfComponents=4; - type=UndefinedType; - if (image_info->type != TrueColorType) - type=IdentifyImageCoderType(image,exception); - if (IsGrayImageType(type) != MagickFalse) + if ((image_info->type != TrueColorType) && + (IdentifyImageCoderGray(image,exception) != MagickFalse)) { colorspace.numberOfComponents=1; colorspace.theComponents[0].myColor=MONOCHROME; @@ -861,19 +846,9 @@ compression=JPEG_UNSPECIFIED; if (image_info->compression == JPEGCompression) compression=JPEG_UNSPECIFIED; - { -#if defined(macintosh) - FSSpec - fsspec; - - FilenameToFSSpec(filename,&fsspec); - fpx_status=FPX_CreateImageByFilename((const FSSpec &) fsspec,image->columns, -#else - fpx_status=FPX_CreateImageByFilename(image->filename,image->columns, -#endif - image->rows,tile_width,tile_height,colorspace,background_color, - compression,&flashpix); - } + fpx_status=FPX_CreateImageByFilename(image->filename,image->columns, + image->rows,tile_width,tile_height,colorspace,background_color,compression, + &flashpix); if (fpx_status != FPX_OK) return(status); if (compression == JPEG_UNSPECIFIED)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/heic.c ^
@@ -408,7 +408,6 @@ ExceptionInfo exception) { heif_item_id - image_ids, primary_image_id; Image @@ -490,10 +489,13 @@ return(DestroyImageList(image)); } status=ReadHEICImageHandle(image_info,image,image_handle,exception); - image_ids=(heif_item_id ) NULL; + heif_image_handle_release(image_handle); count=(size_t) heif_context_get_number_of_top_level_images(heif_context); if ((status != MagickFalse) && (count > 1)) { + heif_item_id + image_ids; + size_t i; @@ -501,7 +503,6 @@ sizeof(image_ids)); if (image_ids == (heif_item_id ) NULL) { - heif_image_handle_release(image_handle); heif_context_free(heif_context); file_data=RelinquishMagickMemory(file_data); return(DestroyImageList(image)); @@ -530,14 +531,15 @@ break; } status=ReadHEICImageHandle(image_info,image,image_handle,exception); + heif_image_handle_release(image_handle); if (status == MagickFalse) break; if (image_info->number_scenes != 0) if (image->scene >= (image_info->scene+image_info->number_scenes-1)) break; } + image_ids=(heif_item_id ) RelinquishMagickMemory(image_ids); } - heif_image_handle_release(image_handle); error=heif_context_get_image_handle(heif_context,primary_image_id, &image_handle); if (IsHeifSuccess(image,&error,exception) == MagickFalse) @@ -548,8 +550,6 @@ } ReadHEICDepthImage(image_info,image,image_handle,exception); heif_image_handle_release(image_handle); - if (image_ids != (heif_item_id ) NULL) - (void) RelinquishMagickMemory(image_ids); heif_context_free(heif_context); file_data=RelinquishMagickMemory(file_data); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/jpeg.c ^
@@ -2334,15 +2334,11 @@ } default: { - ImageType - type; - if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse) (void) TransformImageColorspace(image,sRGBColorspace,exception); if (image_info->type == TrueColorType) break; - type=IdentifyImageCoderType(image,exception); - if (IsGrayImageType(type) != MagickFalse) + if (IdentifyImageCoderGray(image,exception) != MagickFalse) { jpeg_info->input_components=1; jpeg_info->in_color_space=JCS_GRAYSCALE; @@ -2703,30 +2699,9 @@ "Number of colors: unspecified"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), "JPEG data precision: %d",(int) jpeg_info->data_precision); - switch (image->colorspace) - { - case CMYKColorspace: - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Storage class: DirectClass"); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Colorspace: CMYK"); - break; - } - case YCbCrColorspace: - case Rec601YCbCrColorspace: - case Rec709YCbCrColorspace: - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Colorspace: YCbCr"); - break; - } - default: - break; - } - switch (image->colorspace) + switch (jpeg_info->in_color_space) { - case CMYKColorspace: + case JCS_CMYK: { (void) LogMagickEvent(CoderEvent,GetMagickModule(), "Colorspace: CMYK"); @@ -2742,7 +2717,7 @@ jpeg_info->comp_info[3].v_samp_factor); break; } - case GRAYColorspace: + case JCS_GRAYSCALE: { (void) LogMagickEvent(CoderEvent,GetMagickModule(), "Colorspace: GRAY"); @@ -2751,11 +2726,10 @@ jpeg_info->comp_info[0].v_samp_factor); break; } - case sRGBColorspace: - case RGBColorspace: + case JCS_UNKNOWN: { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Image colorspace is RGB"); + "Colorspace: RGB"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), "Sampling factors: %dx%d,%dx%d,%dx%d", jpeg_info->comp_info[0].h_samp_factor, @@ -2766,9 +2740,7 @@ jpeg_info->comp_info[2].v_samp_factor); break; } - case YCbCrColorspace: - case Rec601YCbCrColorspace: - case Rec709YCbCrColorspace: + case JCS_YCbCr: { (void) LogMagickEvent(CoderEvent,GetMagickModule(), "Colorspace: YCbCr"); @@ -2782,22 +2754,7 @@ jpeg_info->comp_info[2].v_samp_factor); break; } - default: - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Colorspace: %d", - image->colorspace); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Sampling factors: %dx%d,%dx%d,%dx%d,%dx%d", - jpeg_info->comp_info[0].h_samp_factor, - jpeg_info->comp_info[0].v_samp_factor, - jpeg_info->comp_info[1].h_samp_factor, - jpeg_info->comp_info[1].v_samp_factor, - jpeg_info->comp_info[2].h_samp_factor, - jpeg_info->comp_info[2].v_samp_factor, - jpeg_info->comp_info[3].h_samp_factor, - jpeg_info->comp_info[3].v_samp_factor); - break; - } + default: break; } } /*
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/jxl.c ^
@@ -356,6 +356,8 @@ decoder_status=JxlDecoderGetColorAsICCProfile(decoder,&format, JXL_COLOR_PROFILE_TARGET_ORIGINAL,GetStringInfoDatum(profile), profile_size); + (void) SetImageProfile(image,"icc",profile,exception); + DestroyStringInfo(profile); if (decoder_status == JXL_DEC_SUCCESS) decoder_status=JXL_DEC_COLOR_ENCODING; break; @@ -523,26 +525,16 @@ static JxlEncoderStatus JXLWriteMetadata(const Image image, JxlEncoder encoder) { - const StringInfo - profile; - JxlColorEncoding color_encoding; JxlEncoderStatus encoder_status; - profile=GetImageProfile(image,"ICC"); - if (profile != (const StringInfo ) NULL) - encoder_status=JxlEncoderSetICCProfile(encoder, - (void) GetStringInfoDatum(profile),GetStringInfoLength(profile)); - else - { - memset(&color_encoding,0,sizeof(color_encoding)); - JxlColorEncodingSetToLinearSRGB(&color_encoding, - IsImageGray(image) == MagickTrue ? JXL_TRUE : JXL_FALSE); - encoder_status=JxlEncoderSetColorEncoding(encoder,&color_encoding); - } + memset(&color_encoding,0,sizeof(color_encoding)); + JxlColorEncodingSetToSRGB(&color_encoding, + IsImageGray(image) == MagickTrue ? JXL_TRUE : JXL_FALSE); + encoder_status=JxlEncoderSetColorEncoding(encoder,&color_encoding); return(encoder_status); } @@ -620,7 +612,7 @@ } memset(&format,0,sizeof(format)); JXLSetFormat(image,&format); - memset(&basic_info,0,sizeof(basic_info)); + JxlEncoderInitBasicInfo(&basic_info); basic_info.xsize=(uint32_t) image->columns; basic_info.ysize=(uint32_t) image->rows; basic_info.bits_per_sample=8; @@ -663,6 +655,7 @@ if (option != (const char ) NULL) JxlEncoderOptionsSetEffort(encoder_options,StringToInteger(option)); encoder_status=JXLWriteMetadata(image,encoder); + encoder_status=JXL_ENC_SUCCESS; if (encoder_status != JXL_ENC_SUCCESS) { JxlThreadParallelRunnerDestroy(runner);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/label.c ^
@@ -52,11 +52,13 @@ #include "MagickCore/list.h" #include "MagickCore/magick.h" #include "MagickCore/memory_.h" +#include "MagickCore/option.h" #include "MagickCore/property.h" #include "MagickCore/quantum-private.h" #include "MagickCore/resource_.h" #include "MagickCore/static.h" #include "MagickCore/string_.h" +#include "MagickCore/string-private.h" #include "MagickCore/module.h" #include "MagickCore/utility.h" @@ -90,17 +92,14 @@ static inline void AdjustTypeMetricBounds(TypeMetric metrics) { - double - x1; - if (metrics->bounds.x1 >= 0.0) + metrics->bounds.x1=0.0; + else { - metrics->bounds.x1=0.0; - return; + double x1 = ceil(-metrics->bounds.x1+0.5); + metrics->width+=x1+x1; + metrics->bounds.x1=x1; } - x1=ceil(-metrics->bounds.x1+0.5); - metrics->width+=x1+x1; - metrics->bounds.x1=x1; } static Image ReadLABELImage(const ImageInfo image_info, @@ -172,6 +171,9 @@ (((image->columns == 0) \|\| (image->rows == 0)) \|\| (fabs(image_info->pointsize) < MagickEpsilon))) { + const char + option; + double high, low; @@ -182,37 +184,59 @@ /* Auto fit text into bounding box. / - for (n=0; n < 32; n++, draw_info->pointsize=2.0) - { - (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g", - metrics.bounds.x1,metrics.ascent); - if (draw_info->gravity == UndefinedGravity) - (void) CloneString(&draw_info->geometry,geometry); - status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception); - if (status == MagickFalse) - break; - AdjustTypeMetricBounds(&metrics); - width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5); - height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5); - if ((image->columns != 0) && (image->rows != 0)) + low=1.0; + option=GetImageOption(image_info,"label:max-pointsize"); + if (option != (const char) NULL) + { + high=StringToDouble(option,(char) NULL); + if (high < 1.0) + high=1.0; + high+=1.0; + } + else + { + option=GetImageOption(image_info,"label:start-pointsize"); + if (option != (const char ) NULL) + { + draw_info->pointsize=StringToDouble(option,(char*) NULL); + if (draw_info->pointsize < 1.0) + draw_info->pointsize=1.0; + } + for (n=0; n < 32; n++, draw_info->pointsize=2.0) { - if ((width >= image->columns) && (height >= image->rows)) + (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g", + metrics.bounds.x1,metrics.ascent); + if (draw_info->gravity == UndefinedGravity) + (void) CloneString(&draw_info->geometry,geometry); + status=GetMultilineTypeMetrics(image,draw_info,&metrics, + exception); + if (status == MagickFalse) break; + AdjustTypeMetricBounds(&metrics); + width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5); + height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5); + if ((image->columns != 0) && (image->rows != 0)) + { + if ((width >= image->columns) \|\| (height >= image->rows)) + break; + if ((width < image->columns) && (height < image->rows)) + low=draw_info->pointsize; + } + else + if (((image->columns != 0) && (width >= image->columns)) \|\| + ((image->rows != 0) && (height >= image->rows))) + break; } - else - if (((image->columns != 0) && (width >= image->columns)) \|\| - ((image->rows != 0) && (height >= image->rows))) - break; - } - if (status == MagickFalse) - { - label=DestroyString(label); - draw_info=DestroyDrawInfo(draw_info); - image=DestroyImageList(image); - return((Image ) NULL); + if (status == MagickFalse) + { + label=DestroyString(label); + draw_info=DestroyDrawInfo(draw_info); + image=DestroyImageList(image); + return((Image ) NULL); + } } high=draw_info->pointsize; - for (low=1.0; (high-low) > 0.5; ) + while((high-low) > 0.5) { draw_info->pointsize=(low+high)/2.0; (void) FormatLocaleString(geometry,MagickPathExtent,"%+g%+g",
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/mat.c ^
@@ -1646,9 +1646,6 @@ char padding; - ImageType - type; - MagickBooleanType is_gray; @@ -1666,9 +1663,7 @@ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse) (void) TransformImageColorspace(image,sRGBColorspace,exception); - type=IdentifyImageCoderType(image,exception); - is_gray=(IsGrayImageType(type) != MagickFalse) ? MagickTrue : - MagickFalse; + is_gray=IdentifyImageCoderGray(image,exception); z=(is_gray != MagickFalse) ? 0 : 3; /*
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/meta.c ^
@@ -1812,12 +1812,8 @@ #if defined(MAGICKCORE_WINDOWS_SUPPORT) (void) WriteBlobString(ofile,"\"\r\n"); #else -#if defined(macintosh) - (void) WriteBlobString(ofile,"\"\r"); -#else (void) WriteBlobString(ofile,"\"\n"); #endif -#endif } typedef struct _tag_spec
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/pcl.c ^
@@ -234,10 +234,11 @@ flags; flags=ParseGeometry(PSDensityGeometry,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } /* Determine page geometry from the PCL media box.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/pdf.c ^
@@ -462,18 +462,20 @@ if ((image->resolution.x == 0.0) \|\| (image->resolution.y == 0.0)) { flags=ParseGeometry(PSDensityGeometry,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } if (image_info->density != (char ) NULL) { flags=ParseGeometry(image_info->density,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } (void) ParseAbsoluteGeometry(PSPageGeometry,&page); if (image_info->page != (char ) NULL) @@ -1454,10 +1456,8 @@ version=1.6; for (next=image; next != (Image ) NULL; next=GetNextImageInList(next)) { - ImageType type = UndefinedType; - if (image_info->type != TrueColorType) - type=IdentifyImageCoderType(next,exception); - if (IsGrayImageType(type) != MagickFalse) + if ((image_info->type != TrueColorType) && + (IdentifyImageCoderGray(next,exception) != MagickFalse)) SetImageColorspace(next,GRAYColorspace,exception); icc_profile=GetCompatibleColorProfile(next); if (icc_profile != (StringInfo ) NULL) @@ -1614,9 +1614,6 @@ Image tile_image; - ImageType - type; - MagickBooleanType thumbnail; @@ -1692,18 +1689,20 @@ if ((resolution.x == 0.0) \|\| (resolution.y == 0.0)) { flags=ParseGeometry(PSDensityGeometry,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - resolution.y=resolution.x; + if ((flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } if (image_info->density != (char ) NULL) { flags=ParseGeometry(image_info->density,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - resolution.y=resolution.x; + if ((flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } if (image->units == PixelsPerCentimeterResolution) { @@ -1987,11 +1986,8 @@ number_pixels=(MagickSizeType) image->columnsimage->rows; if ((4number_pixels) != (MagickSizeType) ((size_t) (4number_pixels))) ThrowPDFException(ResourceLimitError,"MemoryAllocationFailed"); - type=UndefinedType; - if (image_info->type != TrueColorType) - type=IdentifyImageCoderType(image,exception); if ((compression == FaxCompression) \|\| (compression == Group4Compression) \|\| - (IsGrayImageType(type) != MagickFalse)) + (IsImageGray(image) != MagickFalse)) { switch (compression) { @@ -2346,9 +2342,6 @@ (void) WriteBlobString(image,buffer); device="DeviceRGB"; channels=0; - type=UndefinedType; - if (image_info->type != TrueColorType) - type=IdentifyImageCoderType(image,exception); if (image->colorspace == CMYKColorspace) { device="DeviceCMYK"; @@ -2357,7 +2350,7 @@ else if ((compression == FaxCompression) \|\| (compression == Group4Compression) \|\| - (IsGrayImageType(type) != MagickFalse)) + (IsImageGray(image) != MagickFalse)) { device="DeviceGray"; channels=1; @@ -2522,12 +2515,9 @@ (void) WriteBlobString(image,"stream\n"); offset=TellBlob(image); number_pixels=(MagickSizeType) tile_image->columnstile_image->rows; - type=UndefinedType; - if (image_info->type != TrueColorType) - type=IdentifyImageCoderType(tile_image,exception); if ((compression == FaxCompression) \|\| (compression == Group4Compression) \|\| - (IsGrayImageType(type) != MagickFalse)) + (IsImageGray(image) != MagickFalse)) { switch (compression) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/pict.c ^
@@ -750,7 +750,6 @@ return(MagickFalse); } -#if !defined(macintosh) /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -1548,7 +1547,6 @@ (void) CloseBlob(image); return(GetFirstImageInList(image)); } -#endif /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/png.c ^
@@ -12894,8 +12894,7 @@ if ((image_info->type != TrueColorAlphaType) && (image_info->type != TrueColorType)) { - ImageType type = IdentifyImageCoderType(image,exception); - if (IsGrayImageType(type) != MagickFalse) + if (IdentifyImageCoderGray(image,exception) != MagickFalse) jng_color_type-=2; } @@ -13677,8 +13676,7 @@ if (need_local_plte == 0) { - ImageType type = IdentifyImageCoderType(image,exception); - if ((type != GrayscaleType) && (type != BilevelType)) + if (IdentifyImageCoderGray(image,exception) == MagickFalse) all_images_are_gray=MagickFalse; mng_info->equal_palettes=PalettesAreEqual(image,next_image); if (use_global_plte == 0)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/pnm.c ^
@@ -1851,7 +1851,7 @@ format='F'; if (image_info->type == TrueColorType) break; - if (IdentifyImageCoderType(image,exception) == GrayscaleType) + if (IdentifyImageCoderGray(image,exception) != MagickFalse) format='f'; break; } @@ -1869,7 +1869,7 @@ format='H'; if (image_info->type == TrueColorType) break; - if (IdentifyImageCoderType(image,exception) == GrayscaleType) + if (IdentifyImageCoderGray(image,exception) != MagickFalse) format='h'; break; } @@ -1882,8 +1882,8 @@ format='6'; if (image_info->type == TrueColorType) break; - type=IdentifyImageCoderType(image,exception); - if (type == GrayscaleType) + type=IdentifyImageCoderGrayType(image,exception); + if (IsGrayImageType(type) != MagickFalse) { format='5'; if (image_info->compression == NoCompression) @@ -1894,8 +1894,8 @@ if (image_info->compression == NoCompression) format='1'; } - break; } + break; } default: {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/ps.c ^
@@ -640,18 +640,20 @@ if ((image->resolution.x == 0.0) \|\| (image->resolution.y == 0.0)) { flags=ParseGeometry(PSDensityGeometry,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } if (image_info->density != (char ) NULL) { flags=ParseGeometry(image_info->density,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } (void) ParseAbsoluteGeometry(PSPageGeometry,&page); if (image_info->page != (char ) NULL) @@ -1482,18 +1484,20 @@ if ((resolution.x == 0.0) \|\| (resolution.y == 0.0)) { flags=ParseGeometry(PSDensityGeometry,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - resolution.y=resolution.x; + if ((flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } if (image_info->density != (char ) NULL) { flags=ParseGeometry(image_info->density,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - resolution.y=resolution.x; + if ((flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } if (image->units == PixelsPerCentimeterResolution) { @@ -1770,10 +1774,10 @@ index=(Quantum) 0; x=0; if (image_info->type != TrueColorType) - type=IdentifyImageCoderType(image,exception); + type=IdentifyImageCoderGrayType(image,exception); if (IsGrayImageType(type) != MagickFalse) { - if (type == GrayscaleType) + if (type != BilevelType) { / Dump image as grayscale.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/ps2.c ^
@@ -488,9 +488,6 @@ imageListLength=GetImageListLength(image); do { - ImageType - type; - /* Scale relative to dots-per-inch. / @@ -501,18 +498,20 @@ if ((resolution.x == 0.0) \|\| (resolution.y == 0.0)) { flags=ParseGeometry(PSDensityGeometry,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - resolution.y=resolution.x; + if ((flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } if (image_info->density != (char ) NULL) { flags=ParseGeometry(image_info->density,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - resolution.y=resolution.x; + if ((flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } if (image->units == PixelsPerCentimeterResolution) { @@ -728,11 +727,9 @@ number_pixels=(MagickSizeType) image->columns*image->rows; if (number_pixels != (MagickSizeType) ((size_t) number_pixels)) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - type=UndefinedType; - if (image_info->type != TrueColorType) - type=IdentifyImageCoderType(image,exception); if ((compression == FaxCompression) \|\| (compression == Group4Compression) \|\| - (IsGrayImageType(type) != MagickFalse)) + ((image_info->type != TrueColorType) && + (IdentifyImageCoderGray(image,exception) != MagickFalse))) { (void) FormatLocaleString(buffer,MagickPathExtent, "%.20g %.20g\n1\n%d\n",(double) image->columns,(double) image->rows,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/ps3.c ^
@@ -935,8 +935,8 @@ imageListLength=GetImageListLength(image); do { - ImageType - type; + MagickBooleanType + is_gray; /* Scale relative to dots-per-inch. @@ -948,18 +948,20 @@ if ((resolution.x == 0.0) \|\| (resolution.y == 0.0)) { flags=ParseGeometry(PSDensityGeometry,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - resolution.y=resolution.x; + if ((flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } if (image_info->density != (char ) NULL) { flags=ParseGeometry(image_info->density,&geometry_info); - resolution.x=geometry_info.rho; - resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - resolution.y=resolution.x; + if ((flags & RhoValue) != 0) + resolution.x=geometry_info.rho; + resolution.y=resolution.x; + if ((flags & SigmaValue) != 0) + resolution.y=geometry_info.sigma; } if (image->units == PixelsPerCentimeterResolution) { @@ -1003,7 +1005,7 @@ if (value != (const char ) NULL) text_size=(size_t) (MultilineCensus(value)pointsize+12); page++; - type=IdentifyImageCoderType(image,exception); + is_gray=IdentifyImageCoderGray(image,exception); if (page == 1) { / @@ -1050,7 +1052,7 @@ (void) WriteBlobString(image, "%%DocumentProcessColors: Cyan Magenta Yellow Black\n"); else - if (IsGrayImageType(type) != MagickFalse) + if (is_gray != MagickFalse) (void) WriteBlobString(image, "%%DocumentProcessColors: Black\n"); } @@ -1128,7 +1130,7 @@ (void) WriteBlobString(image, "%%PageProcessColors: Cyan Magenta Yellow Black\n"); else - if (IsGrayImageType(type) != MagickFalse) + if (is_gray != MagickFalse) (void) WriteBlobString(image,"%%PageProcessColors: Black\n"); /* Adjust document bounding box to bound page bounding box. @@ -1266,7 +1268,7 @@ (image_info->type != ColorSeparationType) && (image_info->type != ColorSeparationAlphaType) && (image->colorspace != CMYKColorspace) && - (IsGrayImageType(type) != MagickFalse)) + (is_gray != MagickFalse)) { /* Gray images.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/psd.c ^
@@ -1726,7 +1726,7 @@ const ImageInfo image_info,const size_t index) { if (psd_info->has_merged_image == MagickFalse) - return(MagickFalse); + return(MagickFalse); if (image_info->number_scenes == 0) return(MagickFalse); if (index < image_info->scene) @@ -3762,9 +3762,6 @@ const StringInfo icc_profile; - ImageType - type; - MagickBooleanType status; @@ -3803,9 +3800,6 @@ (void) WriteBlobMSBShort(image,psd_info.version); /* version / for (i=1; i <= 6; i++) (void) WriteBlobByte(image, 0); / 6 bytes of reserved / - / When the image has a color profile it won't be converted to gray scale / - type=IdentifyImageCoderType(image,exception); - (void) type; if ((GetImageProfile(image,"icc") == (StringInfo ) NULL) && (SetImageGray(image,exception) != MagickFalse)) num_channels=(image->alpha_trait != UndefinedPixelTrait ? 2UL : 1UL); @@ -3927,6 +3921,9 @@ const char option; + CompressionType + compression; + MagickOffsetType size_offset; @@ -3942,17 +3939,11 @@ exception); (void) WritePSDSize(&psd_info,image,size+ (psd_info.version == 1 ? 8 : 12),size_offset); + (void) WriteBlobMSBLong(image,0); / user mask data / } - } - (void) WriteBlobMSBLong(image,0); / user mask data / - / - Write composite image. - / - if (status != MagickFalse) - { - CompressionType - compression; - + / + Write composite image. + */ compression=image->compression; if (image_info->compression != UndefinedCompression) image->compression=image_info->compression;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/sgi.c ^
@@ -986,13 +986,8 @@ iris_info.depth=4; else { - ImageType - type; - - type=UndefinedType; - if (image_info->type != TrueColorType) - type=IdentifyImageCoderType(image,exception); - if (IsGrayImageType(type) != MagickFalse) + if ((image_info->type != TrueColorType) && + (IdentifyImageCoderGray(image,exception) != MagickFalse)) { iris_info.dimension=2; iris_info.depth=1;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/svg.c ^
@@ -3706,10 +3706,11 @@ flags; flags=ParseGeometry(SVGDensityGeometry,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } if (LocaleCompare(image_info->magick,"MSVG") != 0) { @@ -3979,9 +3980,6 @@ at_splines_type splines; - ImageType - type; - const Quantum p; @@ -4001,8 +3999,7 @@ fitting_options=at_fitting_opts_new(); output_options=at_output_opts_new(); number_planes=3; - type=IdentifyImageCoderType(image,exception); - if (IsGrayImageType(type) != MagickFalse) + if (IdentifyImageCoderGray(image,exception) != MagickFalse) number_planes=1; trace=at_bitmap_new(image->columns,image->rows,number_planes); i=0;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/tga.c ^
@@ -729,9 +729,6 @@ const Quantum *p; - ImageType - type; - MagickBooleanType status; @@ -798,14 +795,11 @@ tga_info.height=(unsigned short) image->rows; tga_info.bits_per_pixel=8; tga_info.attributes=0; - type=UndefinedType; - if (image_info->type != TrueColorType) - type=IdentifyImageCoderType(image,exception); if ((image_info->type != TrueColorType) && (image_info->type != TrueColorAlphaType) && (image_info->type != PaletteType) && (image->alpha_trait == UndefinedPixelTrait) && - (IsGrayImageType(type) != MagickFalse)) + (IdentifyImageCoderGray(image,exception) != MagickFalse)) tga_info.image_type=compression == RLECompression ? TGARLEMonochrome : TGAMonochrome; else
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/tiff.c ^
@@ -2001,6 +2001,11 @@ if (HeapOverflowSanityCheck(rows,sizeof(tile_pixels)) != MagickFalse) ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed"); extent=MagickMax(rowsTIFFTileRowSize(tiff),TIFFTileSize(tiff)); +#if defined(TIFF_VERSION_BIG) + extent+=image->columnssizeof(uint64); +#else + extent+=image->columnssizeof(uint32); +#endif tile_pixels=(unsigned char ) AcquireQuantumMemory(extent, sizeof(tile_pixels)); if (tile_pixels == (unsigned char *) NULL) @@ -3589,12 +3594,8 @@ if ((image_info->type != TrueColorType) && (image_info->type != TrueColorAlphaType)) { - ImageType - type; - - type=IdentifyImageCoderType(image,exception); if ((image_info->type != PaletteType) && - (IsGrayImageType(type) != MagickFalse)) + (IdentifyImageCoderGray(image,exception) != MagickFalse)) { photometric=(uint16) (quantum_info->min_is_white != MagickFalse ? PHOTOMETRIC_MINISWHITE :
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/txt.c ^
@@ -220,10 +220,11 @@ flags; flags=ParseGeometry(PSDensityGeometry,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } page.width=612; page.height=792;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/viff.c ^
@@ -994,8 +994,8 @@ imageListLength=GetImageListLength(image); do { - ImageType - type; + MagickBooleanType + is_gray; /* Initialize VIFF image structure. @@ -1030,7 +1030,7 @@ viff_info.map_enable=1; /* no colormap / viff_info.maps_per_cycle=0; number_pixels=(MagickSizeType) image->columnsimage->rows; - type=IdentifyImageCoderType(image,exception); + is_gray=IdentifyImageCoderGray(image,exception); if (image->storage_class == DirectClass) { /* @@ -1047,7 +1047,7 @@ viff_info.color_space_model=VFF_CM_NONE; viff_info.data_storage_type=VFF_TYP_1_BYTE; packets=number_pixels; - if ((type != GrayscaleType) && (type != BilevelType)) + if (is_gray == MagickFalse) { /* Colormapped VIFF raster. @@ -1148,7 +1148,7 @@ } } else - if ((type != GrayscaleType) && (type != BilevelType)) + if (is_gray == MagickFalse) { unsigned char *viff_colormap;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/vips.c ^
@@ -626,9 +626,6 @@ const Quantum *p; - ImageType - type; - MagickBooleanType status; @@ -658,8 +655,7 @@ (void) WriteBlobLong(image,(unsigned int) image->rows); (void) SetImageStorageClass(image,DirectClass,exception); channels=image->alpha_trait != UndefinedPixelTrait ? 4 : 3; - type=IdentifyImageCoderType(image,exception); - if (IsGrayImageType(type) != MagickFalse) + if (IdentifyImageCoderGray(image,exception) != MagickFalse) { channels=image->alpha_trait != UndefinedPixelTrait ? 2 : 1; (void) SetImageColorspace(image,GRAYColorspace,exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/wpg.c ^
@@ -709,10 +709,18 @@ if(Flags & LCK) (void) ReadBlobLSBLong(image); /Edit lock/ if(Flags & OID) { - if(Precision==0) - {(void) ReadBlobLSBShort(image);} /ObjectID/ - else - {(void) ReadBlobLSBLong(image);} /ObjectID (Double precision)/ + /* Read object ID. */ + if (Precision == 0) + { + x=ReadBlobLSBShort(image); + if (x >= 0x8000) + { + Precision=1; + (void) ReadBlobLSBShort(image); + } + } + else + (void) ReadBlobLSBLong(image); } if(Flags & ROT) { @@ -824,7 +832,7 @@ { c=ReadBlobByte(image); if (c == EOF) - { + { (void) fclose(ps_file); ThrowException(exception,CorruptImageError,"ImproperImageHeader", image->filename); @@ -842,7 +850,7 @@ (void) CopyMagickString(clone_info->magick,GetMagicName(magic_info), MagickPathExtent); if (LocaleCompare(clone_info->magick,"PFB") != 0) - { + { ThrowException(exception,CorruptImageError,"ImproperImageHeader", image->filename); goto FINISH_UNL;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/xpm.c ^
@@ -674,9 +674,6 @@ ImageInfo blob_info; - ImageType - type; - MagickBooleanType status, transparent; @@ -733,9 +730,8 @@ blob_info=CloneImageInfo(image_info); blob_info->magick='\0'; (void) AcquireUniqueFilename(blob_info->filename); - type=IdentifyImageCoderType(image,exception); if ((image_info->type != TrueColorType) && - (IsGrayImageType(type) != MagickFalse)) + (IdentifyImageCoderGray(image,exception) != MagickFalse)) affinity_image=BlobToImage(blob_info,Graymap,GraymapExtent,exception); else affinity_image=BlobToImage(blob_info,Colormap,ColormapExtent,exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/xps.c ^
@@ -209,18 +209,20 @@ if ((image->resolution.x == 0.0) \|\| (image->resolution.y == 0.0)) { flags=ParseGeometry(PSDensityGeometry,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } if (image_info->density != (char ) NULL) { flags=ParseGeometry(image_info->density,&geometry_info); - image->resolution.x=geometry_info.rho; - image->resolution.y=geometry_info.sigma; - if ((flags & SigmaValue) == 0) - image->resolution.y=image->resolution.x; + if ((flags & RhoValue) != 0) + image->resolution.x=geometry_info.rho; + image->resolution.y=image->resolution.x; + if ((flags & SigmaValue) != 0) + image->resolution.y=geometry_info.sigma; } (void) ParseAbsoluteGeometry(PSPageGeometry,&page); if (image_info->page != (char ) NULL)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/coders/yuv.c ^
@@ -160,10 +160,11 @@ flags; flags=ParseGeometry(image_info->sampling_factor,&geometry_info); - horizontal_factor=(ssize_t) geometry_info.rho; - vertical_factor=(ssize_t) geometry_info.sigma; - if ((flags & SigmaValue) == 0) - vertical_factor=horizontal_factor; + if ((flags & RhoValue) != 0) + horizontal_factor=(ssize_t) geometry_info.rho; + vertical_factor=horizontal_factor; + if ((flags & SigmaValue) != 0) + vertical_factor=(ssize_t) geometry_info.sigma; if ((horizontal_factor != 1) && (horizontal_factor != 2) && (vertical_factor != 1) && (vertical_factor != 2)) ThrowReaderException(CorruptImageError,"UnexpectedSamplingFactor"); @@ -660,10 +661,11 @@ flags; flags=ParseGeometry(image_info->sampling_factor,&geometry_info); - horizontal_factor=(ssize_t) geometry_info.rho; - vertical_factor=(ssize_t) geometry_info.sigma; - if ((flags & SigmaValue) == 0) - vertical_factor=horizontal_factor; + if ((flags & RhoValue) != 0) + horizontal_factor=(ssize_t) geometry_info.rho; + vertical_factor=horizontal_factor; + if ((flags & SigmaValue) != 0) + vertical_factor=(ssize_t) geometry_info.sigma; if ((horizontal_factor != 1) && (horizontal_factor != 2) && (vertical_factor != 1) && (vertical_factor != 2)) ThrowWriterException(CorruptImageError,"UnexpectedSamplingFactor");
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/configure ^
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ImageMagick 7.1.0-9. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.1.0-13. # # Report bugs to <https://github.com/ImageMagick/ImageMagick/issues>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.1.0-9' -PACKAGE_STRING='ImageMagick 7.1.0-9' +PACKAGE_VERSION='7.1.0-13' +PACKAGE_STRING='ImageMagick 7.1.0-13' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='https://imagemagick.org' @@ -816,9 +816,10 @@ LCMS_DELEGATE_TRUE LCMS2_LIBS LCMS2_CFLAGS -JXL_LIBS JXL_DELEGATE_FALSE JXL_DELEGATE_TRUE +JXL_LIBS +JXL_CFLAGS JPEG_LIBS JPEG_DELEGATE_FALSE JPEG_DELEGATE_TRUE @@ -1280,6 +1281,8 @@ GVC_LIBS HEIF_CFLAGS HEIF_LIBS +JXL_CFLAGS +JXL_LIBS LCMS2_CFLAGS LCMS2_LIBS LIBOPENJP2_CFLAGS @@ -1856,7 +1859,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ImageMagick 7.1.0-9 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.1.0-13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1932,7 +1935,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of ImageMagick 7.1.0-9:";; + short \| recursive ) echo "Configuration of ImageMagick 7.1.0-13:";; esac cat <<\_ACEOF @@ -2122,6 +2125,8 @@ GVC_LIBS linker flags for GVC, overriding pkg-config HEIF_CFLAGS C compiler flags for HEIF, overriding pkg-config HEIF_LIBS linker flags for HEIF, overriding pkg-config + JXL_CFLAGS C compiler flags for JXL, overriding pkg-config + JXL_LIBS linker flags for JXL, overriding pkg-config LCMS2_CFLAGS C compiler flags for LCMS2, overriding pkg-config LCMS2_LIBS linker flags for LCMS2, overriding pkg-config @@ -2227,7 +2232,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.1.0-9 +ImageMagick configure 7.1.0-13 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3278,7 +3283,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ImageMagick $as_me 7.1.0-9, which was +It was created by ImageMagick $as_me 7.1.0-13, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4266,7 +4271,7 @@ # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.1.0-9' + VERSION='7.1.0-13' # Some tools Automake needs. @@ -4559,11 +4564,11 @@ MAGICK_MICRO_VERSION=0 -MAGICK_PATCHLEVEL_VERSION=9 +MAGICK_PATCHLEVEL_VERSION=13 -MAGICK_VERSION=7.1.0-9 +MAGICK_VERSION=7.1.0-13 -MAGICK_GIT_REVISION=19218:442703a3e:20211003 +MAGICK_GIT_REVISION=19319:02476ce3c:20211026 # Substitute library versioning @@ -4585,15 +4590,15 @@ PACKAGE_BASE_VERSION=7.1.0 -PACKAGE_PATCHLEVEL_VERSION=9 +PACKAGE_PATCHLEVEL_VERSION=13 -PACKAGE_VERSION_ADDENDUM=-9 +PACKAGE_VERSION_ADDENDUM=-13 PACKAGE_LIB_VERSION=0x710 -PACKAGE_LIB_VERSION_NUMBER=7,1,0,9 +PACKAGE_LIB_VERSION_NUMBER=7,1,0,13 -PACKAGE_RELEASE_DATE=2021-09-26 +PACKAGE_RELEASE_DATE=2021-10-25 # Ensure that make can run correctly @@ -30700,153 +30705,95 @@ fi -if test "$with_jxl" != 'yes'; then - DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jxl=$with_jxl " -fi -if test "$enable_static" = 'yes'; then - if test "$with_utilities" = 'yes'; then - with_jxl='no' - fi -fi - # Check for the JPEG-XL library. have_jxl='no' +JXL_CFLAGS='' JXL_LIBS='' +JXL_PKG='' if test "$with_jxl" != 'no'; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 $as_echo "-------------------------------------------------------------" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg-xl" >&5 -$as_echo_n "checking for jpeg-xl... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } - failed=0 - passed=0 - ac_fn_c_check_header_mongrel "$LINENO" "jxl/decode.h" "ac_cv_header_jxl_decode_h" "$ac_includes_default" -if test "x$ac_cv_header_jxl_decode_h" = xyes; then : - passed=`expr $passed + 1` -else - failed=`expr $failed + 1` -fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjxl >= 0.6 libjxl_threads" >&5 +$as_echo_n "checking for libjxl >= 0.6 libjxl_threads... " >&6; } - ac_fn_c_check_header_mongrel "$LINENO" "jxl/encode.h" "ac_cv_header_jxl_encode_h" "$ac_includes_default" -if test "x$ac_cv_header_jxl_encode_h" = xyes; then : - passed=`expr $passed + 1` -else - failed=`expr $failed + 1` -fi - - - # This check should be changed once we have a .pc file for the JPEG-XL library. - if test "$enable_static" != 'yes'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JxlDecoderCreate in -ljxl" >&5 -$as_echo_n "checking for JxlDecoderCreate in -ljxl... " >&6; } -if ${ac_cv_lib_jxl_JxlDecoderCreate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljxl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. / - -/ Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char JxlDecoderCreate (); -int -main () -{ -return JxlDecoderCreate (); - ; - return 0;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/configure.ac ^
@@ -2375,49 +2375,23 @@ [with_jxl=$withval], [with_jxl='no']) -if test "$with_jxl" != 'yes'; then - DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jxl=$with_jxl " -fi -if test "$enable_static" = 'yes'; then - if test "$with_utilities" = 'yes'; then - with_jxl='no' - fi -fi - # Check for the JPEG-XL library. have_jxl='no' +JXL_CFLAGS='' JXL_LIBS='' +JXL_PKG='' if test "$with_jxl" != 'no'; then AC_MSG_RESULT([-------------------------------------------------------------]) - AC_MSG_CHECKING([for jpeg-xl]) + PKG_CHECK_MODULES([JXL],[libjxl >= 0.6 libjxl_threads],[have_jxl=yes],[have_jxl=no]) AC_MSG_RESULT([]) - failed=0 - passed=0 - AC_CHECK_HEADER([jxl/decode.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) - AC_CHECK_HEADER([jxl/encode.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) - # This check should be changed once we have a .pc file for the JPEG-XL library. - if test "$enable_static" != 'yes'; then - AC_CHECK_LIB([jxl],[JxlDecoderCreate],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[]) - AC_CHECK_LIB([jxl],[JxlEncoderSetBasicInfo],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[]) - fi +fi - AC_MSG_CHECKING([if jpeg-xl package is complete]) - if test $passed -gt 0; then - if test $failed -gt 0; then - AC_MSG_RESULT([no -- some components failed test]) - have_jxl='no (failed tests)' - else - JXL_LIBS='-ljxl -ljxl_threads' - LIBS="$JXL_LIBS $LIBS" - AC_DEFINE([JXL_DELEGATE],[1],[Define if you have jpeg-xl library]) - AC_MSG_RESULT([yes]) - have_jxl='yes' - fi - else - AC_MSG_RESULT([no]) - fi +if test "$have_jxl" = 'yes'; then + AC_DEFINE([JXL_DELEGATE],[1],[Define if you have jpeg-xl library]) fi + AM_CONDITIONAL([JXL_DELEGATE],[test "$have_jxl" = 'yes']) +AC_SUBST([JXL_CFLAGS]) AC_SUBST([JXL_LIBS]) dnl ===========================================================================
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/m4/version.m4 ^
@@ -27,7 +27,7 @@ m4_define([magick_major_version], [7]) m4_define([magick_minor_version], [1]) m4_define([magick_micro_version], [0]) -m4_define([magick_patchlevel_version], [9]) +m4_define([magick_patchlevel_version], [13]) m4_define([magick_bugreport], [https://github.com/ImageMagick/ImageMagick/issues]) m4_define([magick_url], [https://imagemagick.org])
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/utilities/identify.1 ^
@@ -57,6 +57,7 @@ virtual pixel access method Image Operators: + \-auto-orient automatically orient image \-channel mask set the image channel mask \-grayscale method convert image to grayscale \-negate replace each pixel with its complementary color
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.13+obs1.1.tar.xz/upstream/utilities/identify.1.in ^
@@ -57,6 +57,7 @@ virtual pixel access method Image Operators: + \-auto-orient automatically orient image \-channel mask set the image channel mask \-grayscale method convert image to grayscale \-negate replace each pixel with its complementary color
[-] [+]	Changed	_service:tar_git:ImageMagick.yaml ^
@@ -1,7 +1,7 @@ Name: ImageMagick ### DO NOT FORGET TO BUMP mfr_revision below !!! ### Also, the builds script needs this to not be a macro -Version: 7.1.0.9 +Version: 7.1.0.13 Release: 1.1 Summary: Viewer and Converter for Images Group: Applications/Multimedia @@ -12,7 +12,7 @@ - "%{name}-%{version}.tar.xz" Macros: #- 'debug_build;0' - - 'mfr_revision;9' + - 'mfr_revision;13' - 'maj;7' - 'mfr_version;%{maj}.1.0' - 'quantum_depth;16'