Changes - SailfishOS Open Build Service

Changes of Revision 8

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,12 @@ +* Thu May 12 2022 Nephros <sailfish@nephros.org> - 7.1.0.33-1.1 +- version bump + +* Mon Apr 25 2022 Nephros <sailfish@nephros.org> - 7.1.0.31-1.1 +- version bump + +* Tue Apr 19 2022 Nephros <sailfish@nephros.org> - 7.1.0.30-1.0 +- version bump + * Mon Mar 7 2022 Nephros <sailfish@nephros.org> - 7.1.0.27-1.2 - version bump - fix building - upstream file name change
[-] [+]	Changed	_service:tar_git:ImageMagick.spec ^
@@ -7,7 +7,7 @@ # >> macros # << macros -%define mfr_revision 27 +%define mfr_revision 33 %define maj 7 %define mfr_version %{maj}.1.0 %define quantum_depth 16 @@ -16,8 +16,8 @@ %define source_version %{mfr_version}-%{mfr_revision} Summary: Viewer and Converter for Images -Version: 7.1.0.27+obs1.2 -Release: 1.2 +Version: 7.1.0.33+obs1.0 +Release: 1.1 Group: Applications/Multimedia License: ImageMagick URL: https://imagemagick.org/ @@ -163,7 +163,7 @@ %files devel %defattr(-,root,root,-) # >> files devel -%doc ChangeLog.md +#doc ChangeLog.md %{_libdir}/libMagickCore.so %{_libdir}/libMagickWand.so %{_libdir}/libMagickCore*.la
[-] [+]	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.27+obs1.2</param> + <param name="revision">7.1.0.33+obs1.0</param> <param name="debian">N</param> <param name="dumb">N</param> </service>
[-] [+]	Deleted	_service:tar_git:ImageMagick-7.1.0.27+obs1.2.tar.xz/upstream/ChangeLog.md ^
@@ -1,1148 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - -## [7.1.0-26](https://github.com/ImageMagick/ImageMagick/compare/7.1.0-25...7.1.0-26) - 2022-02-21 - -### Merged - -- Appropriate default kmin, kmax values for lossy and lossless into webp encoder [`#4846`](https://github.com/ImageMagick/ImageMagick/pull/4846) - -### Commits - -- ... [`f43aa87`](https://github.com/ImageMagick/ImageMagick/commit/f43aa87b45ac36dae42a33457603f2d67e5c4fbd) -- https://github.com/ImageMagick/ImageMagick/discussions/4856 [`717546e`](https://github.com/ImageMagick/ImageMagick/commit/717546e1e02660f471bd53bf6a5f83e62ff08f8c) -- Removed the xtrn coder. [`6a863cc`](https://github.com/ImageMagick/ImageMagick/commit/6a863ccebb6d777739fb8d9b5b3b78c868dafb82) -- rename method to TLS-moniker, thread local storage [`5775664`](https://github.com/ImageMagick/ImageMagick/commit/5775664a028c8fdd9fe9d99a4628d08ec57f424c) -- Removed NTGhostscriptDLL and NTGhostscriptLoadDLL from the private header. [`c27d494`](https://github.com/ImageMagick/ImageMagick/commit/c27d494351fcb8e5f1f69cceff27824122c4d0a2) -- remove reference to ImageMagickObject [`a7141eb`](https://github.com/ImageMagick/ImageMagick/commit/a7141eb10579909e1bf5070ebaf700182cbcf25a) -- Fixes for installation in a folder that contains non ASCII characters (#4382). [`9928afc`](https://github.com/ImageMagick/ImageMagick/commit/9928afc2c123f2be6720f5aaa5931978e6ca2e2e) -- https://github.com/ImageMagick/ImageMagick/discussions/4859 [`c1304c0`](https://github.com/ImageMagick/ImageMagick/commit/c1304c02317ba992dde535314c459ced1a463848) -- Changed copyright. [`05b88b4`](https://github.com/ImageMagick/ImageMagick/commit/05b88b46eac5f8929e3461e86748474d98c2e7ab) -- Use MagickBooleanType instead. [`fc3c6fb`](https://github.com/ImageMagick/ImageMagick/commit/fc3c6fbed9ba036bc3227b80a8ac36d30abbbedf) -- ... [`c2617e9`](https://github.com/ImageMagick/ImageMagick/commit/c2617e9a8de9e4a3c481956d647e12f09cec97f0) -- https://github.com/ImageMagick/ImageMagick/issues/4843 [`17eaebd`](https://github.com/ImageMagick/ImageMagick/commit/17eaebd2c1ffb42c1b1b5b17c2db12e19ec69d30) -- https://github.com/ImageMagick/ImageMagick/discussions/4856 [`66cb4f9`](https://github.com/ImageMagick/ImageMagick/commit/66cb4f91bc09b645f0ce3824a8469718d0cbc761) -- https://github.com/ImageMagick/ImageMagick/issues/4761 [`35b2e14`](https://github.com/ImageMagick/ImageMagick/commit/35b2e14d82ae87fe97b2a0e3f49cdd19d82c8f06) -- don't over-allocate thread-specific data [`7ff4ae1`](https://github.com/ImageMagick/ImageMagick/commit/7ff4ae104a9710407786c14223001ad4176d1331) -- ... [`702d55a`](https://github.com/ImageMagick/ImageMagick/commit/702d55a87c2b6dc5052a9a71bbbeba2b0b2fc619) -- adjust -extent geometry support for < && > [`3db22d0`](https://github.com/ImageMagick/ImageMagick/commit/3db22d038089abfdd3bff3ca4f0edc9158ac57e5) -- Changed copyright. [`0efff06`](https://github.com/ImageMagick/ImageMagick/commit/0efff06599dc6d08c30ec19a79c494d2a6607846) -- Removed xtrn coder. [`0d1b03d`](https://github.com/ImageMagick/ImageMagick/commit/0d1b03d3176d47e6f2e512bdc7968a9fa153189a) -- cosmetic [`f3a4813`](https://github.com/ImageMagick/ImageMagick/commit/f3a48131fad4067240698714eba044ca78236c8c) -- https://github.com/ImageMagick/ImageMagick/issues/4867 [`da3971c`](https://github.com/ImageMagick/ImageMagick/commit/da3971cb2ecde8856358e2221aec5b924467ef85) -- fix compiler exception under Cygwin [`ee54f8d`](https://github.com/ImageMagick/ImageMagick/commit/ee54f8dcf76a6c82b741cfdf8e0a7b4558671c9d) -- https://github.com/ImageMagick/ImageMagick/issues/4864 [`3663328`](https://github.com/ImageMagick/ImageMagick/commit/3663328cd031976250bb06cdcd78c1bdffbfe8b8) -- pending release [`a6458f9`](https://github.com/ImageMagick/ImageMagick/commit/a6458f9b8b5805bab5ff781c3ae22baa05cd8494) -- pending release [`1363b1e`](https://github.com/ImageMagick/ImageMagick/commit/1363b1e1e27aac515305f0979541e23c0716932b) -- cosmetic [`6f6caf2`](https://github.com/ImageMagick/ImageMagick/commit/6f6caf214b9cbfd008a8712a501a1e3e6a83b832) -- pending release [`893aea3`](https://github.com/ImageMagick/ImageMagick/commit/893aea3e3d8a102036e67cc0d97e351d69e5b6f6) -- remove references to ImageMagickObject [`ccb6b35`](https://github.com/ImageMagick/ImageMagick/commit/ccb6b35068bfc9bdc7da309d8985cfd6644f8e71) -- Added option to allow specifying -dShowAnnots=false. [`60e8f2c`](https://github.com/ImageMagick/ImageMagick/commit/60e8f2ce8bdf0822cd59e1f898a984d79ef50690) -- https://github.com/ImageMagick/ImageMagick/issues/4865 [`63a25b5`](https://github.com/ImageMagick/ImageMagick/commit/63a25b5f4f5c70a00b330c6fc36133903774752c) -- no need for conditional compile [`57be678`](https://github.com/ImageMagick/ImageMagick/commit/57be6784c1bea811aa35199f56e5cec9777946f0) -- pending release [`78680f5`](https://github.com/ImageMagick/ImageMagick/commit/78680f51e98d6aecf25b0d9951de3d8122d3b871) -- pending release [`4dfd217`](https://github.com/ImageMagick/ImageMagick/commit/4dfd21705173d2a6e3ca4b0a6723a6e1f48ef885) -- pending release [`0c5784d`](https://github.com/ImageMagick/ImageMagick/commit/0c5784d96b39e3ea78105b595dab1342bb963799) -- add strimg image format [`86b1eb4`](https://github.com/ImageMagick/ImageMagick/commit/86b1eb465afe7be1de3a6baf16c535118855a22c) -- pending release [`50b7ec5`](https://github.com/ImageMagick/ImageMagick/commit/50b7ec519c4f07ffd8eb80fdd0aaa00d0e82b6d6) -- Removed unnecessary initialization. [`51cbb7d`](https://github.com/ImageMagick/ImageMagick/commit/51cbb7d8d8ceb70b111dee0a8d1cfe58a7914233) -- off-by-one fix [`352a9ab`](https://github.com/ImageMagick/ImageMagick/commit/352a9ab54ef228553d793c148c717d9f0beac864) -- Raise exception when image could not be read but no exception was raised. [`f939c22`](https://github.com/ImageMagick/ImageMagick/commit/f939c225f2a62e4ba2d8d449f7ffa514a9aac500) -- pending release [`aa668b2`](https://github.com/ImageMagick/ImageMagick/commit/aa668b23d9f4804fe47761bb4ed65b6877cc0914) -- ... [`31720fe`](https://github.com/ImageMagick/ImageMagick/commit/31720fee01114d59f6122ae2251f1452e0e9b67f) -- https://github.com/ImageMagick/ImageMagick/discussions/4755 [`0101c29`](https://github.com/ImageMagick/ImageMagick/commit/0101c2901a8c0922ef0dba06dca446efe38d8dd1) - -## [7.1.0-25](https://github.com/ImageMagick/ImageMagick/compare/7.1.0-24...7.1.0-25) - 2022-02-15 - -### Commits - -- Changed copyright headers. [`3ddbe16`](https://github.com/ImageMagick/ImageMagick/commit/3ddbe16bbe136160f4bbff3804a8423816974e57) -- Removed unused binary. [`a83ebfc`](https://github.com/ImageMagick/ImageMagick/commit/a83ebfcaf3eb79fa846718af70df6b978c8ed946) -- cosmetic [`0e22666`](https://github.com/ImageMagick/ImageMagick/commit/0e2266611121c1eab597a5051fd4cb37d5300e2d) -- https://github.com/ImageMagick/ImageMagick/issues/4841 [`0fec6dc`](https://github.com/ImageMagick/ImageMagick/commit/0fec6dca6c990038c7f275f04b3e6829c9aea95a) -- ... [`191fd98`](https://github.com/ImageMagick/ImageMagick/commit/191fd9864aa54bde02bf1863bc306fbe24843f64) -- Corrected header. [`8960f4d`](https://github.com/ImageMagick/ImageMagick/commit/8960f4d9433627848550f86cecedbad6f5bd4a34) -- Corrected copyright header. [`678fb88`](https://github.com/ImageMagick/ImageMagick/commit/678fb8880e29819d30e5e35b73eafddc9cd9b461) -- https://github.com/ImageMagick/ImageMagick/issues/4837 [`a833062`](https://github.com/ImageMagick/ImageMagick/commit/a8330620ca1695f35bd8a8b07245b78cbe21880b) -- Added missing copyright and header. [`de8c61d`](https://github.com/ImageMagick/ImageMagick/commit/de8c61dc8d2492219397c312653128109d3c7c1f) -- fix unitialized value [`1931a77`](https://github.com/ImageMagick/ImageMagick/commit/1931a7732fb7488d1c7d992ccdb1dffd026aeb5d) -- off-by-one fix [`7f7c905`](https://github.com/ImageMagick/ImageMagick/commit/7f7c90526187ddd560d2a511cde2d9b9acef4fb1) -- Corrected header style. [`18f5a8f`](https://github.com/ImageMagick/ImageMagick/commit/18f5a8fca87fb6dbb204e1c62a426df61842e055) -- pending release [`14e94c3`](https://github.com/ImageMagick/ImageMagick/commit/14e94c311502613805a8973de2dc1d6958858d80) -- display last debugging character [`7fd967e`](https://github.com/ImageMagick/ImageMagick/commit/7fd967ef5e60ac3a814a3b34fc87c48c59dae3a9) -- Removed unnecessary variable. [`6b246ff`](https://github.com/ImageMagick/ImageMagick/commit/6b246ffd6e4c92076c44a75c77d535f861368074) -- Corrected length check. [`a563804`](https://github.com/ImageMagick/ImageMagick/commit/a5638045db7c13d2e8a86e51a4b339080f03d5cc) -- off-by-one fix [`56f1643`](https://github.com/ImageMagick/ImageMagick/commit/56f1643600448447dbdb6c03716ec9474153c43b) -- https://github.com/ImageMagick/ImageMagick/issues/4822 [`111d4e4`](https://github.com/ImageMagick/ImageMagick/commit/111d4e4aae5b27bff8a9028b2ad230bc89a57039) -- one off when debugging [`869315d`](https://github.com/ImageMagick/ImageMagick/commit/869315df81a6c70f339e58e55eccef7c4fb19cc7) -- Removed ImageMagickObject because we no longer support this. [`61dcc55`](https://github.com/ImageMagick/ImageMagick/commit/61dcc55d596e8e241841cb3b9088fd9f55a154e7) -- revert [`7d5e159`](https://github.com/ImageMagick/ImageMagick/commit/7d5e159ed8872c1ce51f1b89b4027689fb80e3a0) -- alpha is never zero [`8d33dd8`](https://github.com/ImageMagick/ImageMagick/commit/8d33dd8dd63729d0cb9ceb7432cadeca69beab17) - -## [7.1.0-24](https://github.com/ImageMagick/ImageMagick/compare/7.1.0-23...7.1.0-24) - 2022-02-12 - -### Commits - -- Changed copyright headers. [`8891ec1`](https://github.com/ImageMagick/ImageMagick/commit/8891ec1db10a70558deef45f61941b4fe0576b66) -- Added copyright headers. [`78e4a56`](https://github.com/ImageMagick/ImageMagick/commit/78e4a56a833cd64f1676bf54847409cae1debaf4) -- Changed copyright headers. [`2056a1f`](https://github.com/ImageMagick/ImageMagick/commit/2056a1f77255bd551926f18ec321063d5c2ee195) -- possible performance optimization [`4a8a0d4`](https://github.com/ImageMagick/ImageMagick/commit/4a8a0d4f26b828532f266143d9dd3b8ca6fb52ac) -- prefer performance over quality [`75d1dbf`](https://github.com/ImageMagick/ImageMagick/commit/75d1dbf70f63ae365e3359d4b8c473a546d68bca) -- Removed reverences to travis. [`aa1806d`](https://github.com/ImageMagick/ImageMagick/commit/aa1806d1f437958cd847692d3c781bdd4c9a22e2) -- https://github.com/ImageMagick/ImageMagick/discussions/4813 [`cadfcdd`](https://github.com/ImageMagick/ImageMagick/commit/cadfcdd11829197ed415177ef00a61921add7345) -- https://github.com/ImageMagick/ImageMagick/issues/4830 [`b3fc034`](https://github.com/ImageMagick/ImageMagick/commit/b3fc034f37ffe46c8314fae42acbd6c6a11b9da5) -- ... [`8c52d6f`](https://github.com/ImageMagick/ImageMagick/commit/8c52d6fa50d7c39ea4446d416640e29dada61996) -- Changed copyright headers. [`67beeff`](https://github.com/ImageMagick/ImageMagick/commit/67beeff5d03c194d0c846632c124905a56324625) -- cosmetic [`68eb33f`](https://github.com/ImageMagick/ImageMagick/commit/68eb33f7660a78ff22daec7a60265db15e3e46fe) -- correct copyright year [`2652397`](https://github.com/ImageMagick/ImageMagick/commit/26523979fc9cb29e586b3e668e1fc6e075fc235e) -- optimize reading of XPM properties [`f578dad`](https://github.com/ImageMagick/ImageMagick/commit/f578dad6151beb51747e7928770975ccddf064b6) -- cosmetic [`4f923a8`](https://github.com/ImageMagick/ImageMagick/commit/4f923a83f2acf86eb56399442223513dcd2aa503) -- Removed IsAVI check (#4819). [`a1c342c`](https://github.com/ImageMagick/ImageMagick/commit/a1c342c04916670b4a1f161a29d24e9c04c4108d) -- Removed unused flags. [`73b1d1d`](https://github.com/ImageMagick/ImageMagick/commit/73b1d1d2d45566f69697e0402508d73946c45359) -- Code style changes. [`1b9c0c9`](https://github.com/ImageMagick/ImageMagick/commit/1b9c0c96e41e48dd26ed2ebbaac36382d249ae96) -- Corrected UTF-16 big endian encoding (#4771). [`1d8b675`](https://github.com/ImageMagick/ImageMagick/commit/1d8b67552892fd3f1342a31f189305fb6b073165) -- remove debugging statement [`e69f2b1`](https://github.com/ImageMagick/ImageMagick/commit/e69f2b1413f1a9f2d5518aad13debacbe5b32195) -- Use GetPixelInfo instead. [`3eb643b`](https://github.com/ImageMagick/ImageMagick/commit/3eb643b7fe36d4a5200afe1e11e79dab48ddc5c4) -- invalid free memory on NULL pointer [`4b03774`](https://github.com/ImageMagick/ImageMagick/commit/4b0377467fb3e1864ccd91c54393ca5d9bdeb3db) -- pending release [`e5eed1c`](https://github.com/ImageMagick/ImageMagick/commit/e5eed1ca1a43df880c8a851a1c49b3cbb31510b1) -- prevent integer overflow [`32ce1ca`](https://github.com/ImageMagick/ImageMagick/commit/32ce1ca9b0746a592461e2cafc134d7a3eecbe54) -- https://github.com/ImageMagick/ImageMagick/issues/4822 [`acc0934`](https://github.com/ImageMagick/ImageMagick/commit/acc0934a25ca392823d3d90febeb093c4ce9f2f0) -- revert [`503333f`](https://github.com/ImageMagick/ImageMagick/commit/503333f87ae676f5e327d83e10def04b3ecee5ab) -- Removed RIFF header to avoid issues with WEBP images (#4819). [`4c156f2`](https://github.com/ImageMagick/ImageMagick/commit/4c156f21b3f6ece862b85bdef6062b6bfd1d7c71) -- eliminate compiler warning [`0595255`](https://github.com/ImageMagick/ImageMagick/commit/0595255bde9edab97da3331f90b7489bc92ca6dc) -- update copyright year [`80629df`](https://github.com/ImageMagick/ImageMagick/commit/80629dfb3fea55eefa2dd8bdd9ca1be341502e16) -- Removed method that has been renamed. [`f8a1cf9`](https://github.com/ImageMagick/ImageMagick/commit/f8a1cf9eae09a52a63609bcacfa3c36bbf6cd4ac) -- Removed empty header file. [`f5f9030`](https://github.com/ImageMagick/ImageMagick/commit/f5f90302c9d3fd9a987fda8f8cddbd6ede4cf697) -- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=44457 [`a9bd4c0`](https://github.com/ImageMagick/ImageMagick/commit/a9bd4c0e16d034f733c93d5d1b022f9e5f78e70e) -- remove debugging statement [`38a2625`](https://github.com/ImageMagick/ImageMagick/commit/38a2625f094c42ac1c62ace34b5c560b8dbfd026) -- Also set the colorspace in the colormap. [`2ec7d4c`](https://github.com/ImageMagick/ImageMagick/commit/2ec7d4cbf8b7d13a2a0afe12e1af3df8cb59b51a) -- Set the alpha_trait of the pixel in the colormap. [`07559b5`](https://github.com/ImageMagick/ImageMagick/commit/07559b540a0c3311bebe8a6948492fcf0101f06b) -- https://github.com/ImageMagick/ImageMagick/issues/4828 [`3e2b04a`](https://github.com/ImageMagick/ImageMagick/commit/3e2b04a63c564aa4f2ce1da45a7346a59d15c0a2) -- Fixed build error. [`15f9463`](https://github.com/ImageMagick/ImageMagick/commit/15f9463eed4b4affd9dd3031d00e86c8f6b4753d) - -## [7.1.0-23](https://github.com/ImageMagick/ImageMagick/compare/7.1.0-22...7.1.0-23) - 2022-02-05 - -### Merged - -- Make MagickSet/GetSamplingFactors() use ':' instead of ',' [`#4794`](https://github.com/ImageMagick/ImageMagick/pull/4794) - -### Commits - -- Moved setting the resolution info from the exif/tiff properties to a separate method. [`7df7426`](https://github.com/ImageMagick/ImageMagick/commit/7df7426ad3a5f7753198fded7d22603370987c03) -- Parse the image info once for all the frames. [`2488fc5`](https://github.com/ImageMagick/ImageMagick/commit/2488fc552ea38f34d7b5463cc81769f50dabff71) -- Renamed struct. [`49edbf0`](https://github.com/ImageMagick/ImageMagick/commit/49edbf034d00512a5e2022cf12d46ff1baf13586) -- The properties can only be deleted after they have been used. [`715cf34`](https://github.com/ImageMagick/ImageMagick/commit/715cf341e699bf928d06e23c2964c3d5b5122471) -- ... [`419dd8d`](https://github.com/ImageMagick/ImageMagick/commit/419dd8de4432beafd827339ca0595895db8ce032) -- Moved sync of orientation to a separate method. [`c3839eb`](https://github.com/ImageMagick/ImageMagick/commit/c3839ebf2fa4d75d8899e68acab892953f8cf553) -- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=44424 [`7069862`](https://github.com/ImageMagick/ImageMagick/commit/70698622896fc9b045527740952b4627a352e119) -- Added extra option to also disable syncing from tiff. [`59ccfd7`](https://github.com/ImageMagick/ImageMagick/commit/59ccfd7425f367c53e9aeb0c7cfbde820086f2f7) -- https://github.com/ImageMagick/ImageMagick/issues/4793 [`6d69fce`](https://github.com/ImageMagick/ImageMagick/commit/6d69fceff3d6a30d8c7a1b7fd6702d9febcf9bd7) -- apply the Fx expression to each image in the sequence [`c516ca8`](https://github.com/ImageMagick/ImageMagick/commit/c516ca8d21c1c2b6b0223b259cfc1f572d343e99) -- Moved declaration of variables. [`1980a3b`](https://github.com/ImageMagick/ImageMagick/commit/1980a3b0faa63159b19a3ba769dbc5f94a886d38) -- exit MVG parser realy if clipping path fails to render [`a628a09`](https://github.com/ImageMagick/ImageMagick/commit/a628a0918de7fa4c54fb84c036775ed6d92d84a8) -- Use read_info instead of image_info. [`b38ab1e`](https://github.com/ImageMagick/ImageMagick/commit/b38ab1e28668bbfb7f39373f05b4906ae66b93ef) -- ... [`51f487a`](https://github.com/ImageMagick/ImageMagick/commit/51f487aaab80518d5f601002bd818e8588b6b439) -- cosmetic [`3fbdf95`](https://github.com/ImageMagick/ImageMagick/commit/3fbdf95d043aed30d7a6aa4fd9b3f68519f3c49f) -- release [`038f317`](https://github.com/ImageMagick/ImageMagick/commit/038f31702e52b5c87254e96b10cb1490d92152a0) -- pending release [`48edb6a`](https://github.com/ImageMagick/ImageMagick/commit/48edb6a2b5e6771354284870667ce0d9c379e6c5) -- https://github.com/ImageMagick/ImageMagick/issues/4790 [`b51707c`](https://github.com/ImageMagick/ImageMagick/commit/b51707c08f3dee192d464d38fc507c86051e62e6) -- small memory leak if images exceed list length [`ce5c2b1`](https://github.com/ImageMagick/ImageMagick/commit/ce5c2b1847cbc90df68b0985cb99e3cf5f852813) -- check if image extent is NaN [`94650bc`](https://github.com/ImageMagick/ImageMagick/commit/94650bc4f10a5bb49e16c0f766adcb0db5f04a41) -- Corrected setting delay instead. [`2adce17`](https://github.com/ImageMagick/ImageMagick/commit/2adce170469980ba2b0d4f33947fa6be3495e732) -- avoid deep recursion [`a42870a`](https://github.com/ImageMagick/ImageMagick/commit/a42870a846d9471ac696475cc3aaabea8c76d6d5) -- ... [`4b4f4c3`](https://github.com/ImageMagick/ImageMagick/commit/4b4f4c381367a83f03959493be622b77abd9117c) -- https://github.com/ImageMagick/ImageMagick/issues/4807 [`9492d1f`](https://github.com/ImageMagick/ImageMagick/commit/9492d1faaee3adeaa270428814844bc72f16f200) -- https://github.com/ImageMagick/ImageMagick/issues/4807 [`d61dd34`](https://github.com/ImageMagick/ImageMagick/commit/d61dd34fe01ee2c48d81932124e1a913ed477c89) -- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=44401 [`a987a8a`](https://github.com/ImageMagick/ImageMagick/commit/a987a8ae4b7e7a1c0f3fc14f53ebbce86230ca47) -- Code style change. [`a6c2928`](https://github.com/ImageMagick/ImageMagick/commit/a6c292867872458731a827dc42aaeb4006a086fd) -- Corrected copy paste mistake. [`c9e20a4`](https://github.com/ImageMagick/ImageMagick/commit/c9e20a4623da788cc2f3f3c316e9456fb7aec41d) - -## [7.1.0-22](https://github.com/ImageMagick/ImageMagick/compare/7.1.0-21...7.1.0-22) - 2022-01-29 - -### Commits - -- bump patch level version [`d2ce572`](https://github.com/ImageMagick/ImageMagick/commit/d2ce5721f36572fb80c7a4df8ccec83a399f15ee) -- permit compositing MPRI images [`5aaf162`](https://github.com/ImageMagick/ImageMagick/commit/5aaf16278f79d2c4e51fd9b75cbe198b8949c407) -- Corrected MPRI fix. [`2c2d1d8`](https://github.com/ImageMagick/ImageMagick/commit/2c2d1d842845a85933c5bbd8b269e305cabdc130) -- permit compositing MPRI images [`cb0ac90`](https://github.com/ImageMagick/ImageMagick/commit/cb0ac90228fdc388cbb724ca68f9afc3619a3d05) -- Only check the path when filename is specified. [`417f4fb`](https://github.com/ImageMagick/ImageMagick/commit/417f4fb9cef7b37aafccd686efd3635202b33d9a) -- pending release [`3eb8a9b`](https://github.com/ImageMagick/ImageMagick/commit/3eb8a9b78e03510542f7d8a7e4d77fd7055d12da) -- check for excessive color name length [`d3b7cdb`](https://github.com/ImageMagick/ImageMagick/commit/d3b7cdbecc0bca9a4eba59e7837830e8acd0b0e9) -- pending release [`c10371d`](https://github.com/ImageMagick/ImageMagick/commit/c10371db6c8363d76f204877110d1d0980502ce8) -- restore MPRI URI [`9651500`](https://github.com/ImageMagick/ImageMagick/commit/9651500e10cb2f7dcf014b2d244753988817ad0b) - -## [7.1.0-21](https://github.com/ImageMagick/ImageMagick/compare/7.1.0-20...7.1.0-21) - 2022-01-28 - -### Merged - -- msl coder: add support for autoorient [`#4745`](https://github.com/ImageMagick/ImageMagick/pull/4745) - -### Commits - -- Cleanup file to use our coding style. [`9b3f50f`](https://github.com/ImageMagick/ImageMagick/commit/9b3f50f6664be6568e47a83a6ac1e5f9b487332b) -- https://github.com/ImageMagick/ImageMagick/discussions/4533 [`4c96061`](https://github.com/ImageMagick/ImageMagick/commit/4c960619700ed551d92bc137df4c60c83699866c) -- check for excessive memory request when drawing [`1496901`](https://github.com/ImageMagick/ImageMagick/commit/1496901aea4d6de5bc5c1051a423e95a80d77995) -- It's a new dawn; It's a new day; It's a new life; For ImageMagick [`03ddd19`](https://github.com/ImageMagick/ImageMagick/commit/03ddd19cfd5a3937aecef34e2173f47c9f2f4825) -- https://github.com/ImageMagick/ImageMagick/issues/4761 [`cdb8e3f`](https://github.com/ImageMagick/ImageMagick/commit/cdb8e3f6e5b2268621ae1317addc7941676a9aab) -- https://github.com/ImageMagick/ImageMagick/issues/4766 [`62845d5`](https://github.com/ImageMagick/ImageMagick/commit/62845d5672eca4446b952dd0ab2e3e0dab0309d4) -- promote blocksize from int to ssize_t [`7347fb3`](https://github.com/ImageMagick/ImageMagick/commit/7347fb36cafe764d9d67c66adf3d80a6c784d22e) -- https://github.com/ImageMagick/ImageMagick/discussions/4533#discussioncomment-20 [`ae90a62`](https://github.com/ImageMagick/ImageMagick/commit/ae90a6229bc6216a728879b18d11c01e34bdbf0a) -- https://github.com/ImageMagick/ImageMagick/discussions/4533 [`a0b049f`](https://github.com/ImageMagick/ImageMagick/commit/a0b049ff449a3b2f8a673b97d77ea7458b580df6) -- ... [`7ba9959`](https://github.com/ImageMagick/ImageMagick/commit/7ba995934e985d22340fddcfc79767d95291c93b) -- PDF unicode title [`f084a86`](https://github.com/ImageMagick/ImageMagick/commit/f084a86ecaf9737af86f242d68d5e9cf25a61144) -- pending release [`ddc7540`](https://github.com/ImageMagick/ImageMagick/commit/ddc75409693fa681446d39e2cf9929780631e848) -- pending release [`622ed89`](https://github.com/ImageMagick/ImageMagick/commit/622ed89edc6d1e38025a72df388f0845fa5e8da6) -- pending release [`2b1d06d`](https://github.com/ImageMagick/ImageMagick/commit/2b1d06d650782c55263ff5bbb8aad65b45775b97)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/.github/workflows/app-image.yml ^
@@ -32,9 +32,7 @@ apt-get install -y git - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 1 + uses: actions/checkout@v3 - name: Install ${{ matrix.compiler }} if: matrix.compiler == 'clang'
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/.github/workflows/codeql-analysis.yml ^
@@ -17,7 +17,7 @@ modules: [ 'with-modules', 'without-modules' ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 2
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/.github/workflows/daily.yml ^
@@ -5,6 +5,35 @@ name: daily jobs: + change_log: + name: 'Create ChangeLog.md' + container: + image: node:18 + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Install dependencies + run: npm install -g auto-changelog + + - name: Create ChangeLog.md + run: \| + export NEXT_VERSION=$(grep -oP "PACKAGE_VERSION='\K[0-9\.-]" configure) + git tag $NEXT_VERSION + auto-changelog --sort-commits date + mkdir artifacts + mv ChangeLog.md artifacts/ChangeLog.md + + - name: Upload ChangeLog.md + uses: actions/upload-artifact@v1 + with: + name: ChangeLog + path: artifacts + build_linux: name: 'Linux Q${{matrix.quantum}}-x64 hdri=${{matrix.hdri}} (${{matrix.modules}})' container: @@ -33,20 +62,17 @@ apt-get install -y autoconf pkg-config gcc libfontconfig1-dev libfreetype6-dev libltdl-dev - name: Clone msttcorefonts - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: ImageMagick/msttcorefonts ref: refs/heads/main - fetch-depth: 1 - name: Install msttcorefonts run: \| set -e ./install.sh - - uses: actions/checkout@v2 - with: - fetch-depth: 1 + - uses: actions/checkout@v3 - name: Configure ImageMagick run: \| @@ -65,6 +91,8 @@ build_windows: name: 'Windows Q${{matrix.quantum}}-${{matrix.platform}} hdri=${{matrix.hdri}} (${{matrix.buildType}})' + needs: + - change_log runs-on: windows-2022 strategy: @@ -84,37 +112,42 @@ steps: - name: Clone ImageMagick-Windows - uses: actions/checkout@v2 + uses: actions/checkout@v3 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 + cd ImageMagick-Windows CloneRepositories.cmd https://github.com/ImageMagick shallow + - name: Download ChangeLog.md + uses: actions/download-artifact@v3 + with: + name: ChangeLog + path: ImageMagick-Windows\ImageMagick + - name: Build configure shell: cmd run: \| call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure + cd ImageMagick-Windows\VisualMagick\configure msbuild configure.2022.sln /m /t:Rebuild /p:Configuration=Release,Platform=x64 - name: Configure ImageMagick shell: cmd run: \| - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure + cd ImageMagick-Windows\VisualMagick\configure configure.exe /noWizard /VS2022 /${{matrix.platform}} /${{matrix.buildType}} - name: Build ImageMagick shell: cmd run: \| call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick + cd ImageMagick-Windows\VisualMagick dir /B .sln > solution set /p solution=<solution msbuild %solution% /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.platform}} @@ -130,37 +163,36 @@ steps: - name: Clone ImageMagick-Windows - uses: actions/checkout@v2 + uses: actions/checkout@v3 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 + cd ImageMagick-Windows CloneRepositories.cmd https://github.com/ImageMagick shallow - name: Build configure shell: cmd run: \| call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure + cd ImageMagick-Windows\VisualMagick\configure msbuild configure.2022.sln /m /t:Rebuild /p:Configuration=Release,Platform=x64 - name: Configure ImageMagick shell: cmd run: \| - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure + cd ImageMagick-Windows\VisualMagick\configure configure.exe /noWizard /VS2022 /x64 /${{matrix.buildType}} /zeroConfigurationSupport - name: Build ImageMagick shell: cmd run: \| call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick + cd ImageMagick-Windows\VisualMagick dir /B *.sln > solution set /p solution=<solution msbuild %solution% /m /t:Rebuild /p:Configuration=Release,Platform=x64 @@ -182,14 +214,13 @@ - name: Prepare git run: git config --global core.autocrlf false - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: repository: ImageMagick/ImageMagick-Windows path: ImageMagick-Windows ref: refs/heads/main - fetch-depth: 1 - uses: msys2/setup-msys2@v2 with:
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/.github/workflows/main.yml ^
@@ -22,9 +22,7 @@ compiler: [ gcc, clang ] steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 1 + - uses: actions/checkout@v3 - name: Install dependencies run: \| @@ -49,9 +47,7 @@ runs-on: macos-latest steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 1 + - uses: actions/checkout@v3 - name: Install dependencies run: \| @@ -80,42 +76,40 @@ platform: [ x86, x64 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: path: ImageMagick - fetch-depth: 1 - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 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 + cd ImageMagick-Windows CloneRepositories.cmd https://github.com/ImageMagick shallow - name: Build configure shell: cmd run: \| call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure + cd ImageMagick-Windows\VisualMagick\configure msbuild configure.2022.sln /m /t:Rebuild /p:Configuration=Release,Platform=x64 - name: Configure ImageMagick shell: cmd run: \| - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure + cd ImageMagick-Windows\VisualMagick\configure configure.exe /noWizard /VS2022 /${{matrix.platform}} /smtd - name: Build ImageMagick shell: cmd run: \| call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick + cd ImageMagick-Windows\VisualMagick msbuild VisualStaticMTD.sln /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.platform}} build_msys2: @@ -126,14 +120,13 @@ - name: Prepare git run: git config --global core.autocrlf false - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: repository: ImageMagick/ImageMagick-Windows path: ImageMagick-Windows ref: refs/heads/main - fetch-depth: 1 - uses: msys2/setup-msys2@v2 with:
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/.github/workflows/release.yml ^
@@ -4,18 +4,50 @@ branches: - main paths: - - 'ChangeLog.md' + - 'configure' + - 'm4/version.m4' name: release jobs: + change_log: + name: 'Create ChangeLog.md' + container: + image: node:18 + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Install dependencies + run: npm install -g auto-changelog + + - name: Create ChangeLog.md + run: \| + export NEXT_VERSION=$(grep -oP "PACKAGE_VERSION='\K[0-9\.-]" configure) + git tag $NEXT_VERSION + auto-changelog --sort-commits date + mkdir artifacts + mv ChangeLog.md artifacts/ChangeLog.md + + - name: Upload ChangeLog.md + uses: actions/upload-artifact@v1 + with: + name: ChangeLog + path: artifacts + release_windows_installer: name: 'Windows ${{matrix.quantum}}${{matrix.hdri_flag}}-${{matrix.platform}} (${{matrix.type}})' + needs: + - change_log runs-on: windows-2022 strategy: fail-fast: false matrix: - platform: [ x64, x86 ] + platform: [ x64, arm64, x86 ] type: [ dll, static ] quantum: [ Q8, Q16 ] hdri: [ HDRI, noHDRI ] @@ -25,6 +57,8 @@ include: - platform: x64 bit: 64 + - platform: arm64 + bit: 64 - platform: x86 bit: 32 - type: dll @@ -35,33 +69,38 @@ hdri_flag: '-HDRI' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 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 + cd ImageMagick-Windows CloneRepositories.cmd https://github.com/ImageMagick shallow + - name: Download ChangeLog.md + uses: actions/download-artifact@v3 + with: + name: ChangeLog + path: ImageMagick-Windows\ImageMagick + - name: Download FFmpeg shell: cmd run: \| powershell Invoke-WebRequest -Uri https://github.com/ImageMagick/ImageMagick-Windows/releases/download/20200615/ffmpeg-4.2.3-win${{matrix.bit}}.exe -OutFile ffmpeg.exe - copy /Y ffmpeg.exe %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\bin + copy /Y ffmpeg.exe ImageMagick-Windows\VisualMagick\bin - name: Download hp2xx shell: cmd run: \| powershell Invoke-WebRequest -Uri https://github.com/ImageMagick/ImageMagick-Windows/releases/download/20200615/hp2xx.exe -OutFile hp2xx.exe - copy /Y hp2xx.exe %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\bin + copy /Y hp2xx.exe ImageMagick-Windows\VisualMagick\bin - name: Install Strawberry Perl - if: ${{matrix.type == 'dll'}} + if: ${{matrix.type == 'dll' && matrix.platform != 'arm64'}} shell: cmd run: \| powershell Invoke-WebRequest -Uri https://github.com/ImageMagick/ImageMagick-Windows/releases/download/20200615/strawberry-perl-5.30.2.1-${{matrix.bit}}bit.msi -OutFile strawberry-perl-5.30.2.1-${{matrix.bit}}bit.msi @@ -78,30 +117,30 @@ shell: cmd run: \| call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure + cd ImageMagick-Windows\VisualMagick\configure msbuild configure.2022.sln /m /t:Rebuild /p:Configuration=Release,Platform=x64 - name: Configure ImageMagick shell: cmd run: \| - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure + cd ImageMagick-Windows\VisualMagick\configure configure.exe /noWizard /VS2022 /includeOptional /installedSupport /deprecated /${{matrix.hdri}} /${{matrix.quantum}} /${{matrix.platform}} /${{matrix.type_flag}} - name: Build ImageMagick shell: cmd run: \| call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick + cd ImageMagick-Windows\VisualMagick set /p solution=<solution msbuild %solution% /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.platform}} - name: Build PerlMagick - if: ${{matrix.type == 'dll'}} + if: ${{matrix.type == 'dll' && matrix.platform != 'arm64'}} shell: cmd run: \| set PATH= call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" - cd %GITHUB_WORKSPACE%\ImageMagick-Windows\ImageMagick\PerlMagick + cd ImageMagick-Windows\ImageMagick\PerlMagick set PATH=%PATH%;C:\Strawberry${{matrix.bit}}\c\bin;C:\Strawberry${{matrix.bit}}\perl\site\bin;C:\Strawberry${{matrix.bit}}\perl\bin;C:\WINDOWS\System32\WindowsPowerShell\v1.0 perl "Makefile.PL" "MAKE=nmake" nmake @@ -117,7 +156,7 @@ shell: cmd run: \| call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" - "C:\Program Files (x86)\Inno Setup 6\iscc.exe" %GITHUB_WORKSPACE%\ImageMagick-Windows\VisualMagick\installer\im-${{matrix.platform}}${{matrix.hdri_flag}}-${{matrix.type}}-${{matrix.quantum}}.iss + "C:\Program Files (x86)\Inno Setup 6\iscc.exe" ImageMagick-Windows\VisualMagick\installer\im-${{matrix.platform}}${{matrix.hdri_flag}}-${{matrix.type}}-${{matrix.quantum}}.iss - name: Sign installer uses: dlemstra/code-sign-action@v1 @@ -132,26 +171,33 @@ release_windows_source: name: 'Windows source' + needs: + - change_log runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: repository: ImageMagick/ImageMagick-Windows path: ImageMagick-Windows ref: refs/heads/main - fetch-depth: 1 + + - name: Download ChangeLog.md + uses: actions/download-artifact@v3 + with: + name: ChangeLog + path: ImageMagick-Windows\ImageMagick - name: Clone repositories shell: cmd run: \| - cd %GITHUB_WORKSPACE%\ImageMagick-Windows + cd ImageMagick-Windows CloneRepositories.cmd https://github.com/ImageMagick source - name: Create source archive shell: cmd run: \| - cd %GITHUB_WORKSPACE%\ImageMagick-Windows + cd ImageMagick-Windows 7z a ImageMagick-Windows.7z .\source\ - uses: actions/upload-artifact@v2 @@ -161,12 +207,14 @@ release_windows_portable: name: 'Windows portable ${{matrix.quantum}}${{matrix.hdri_flag}}-${{matrix.platform}}' + needs: + - change_log runs-on: windows-2022 strategy: fail-fast: false
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/ImageMagick.spec.in ^
@@ -224,7 +224,7 @@ %ldconfig_scriptlets c++ %files -%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt ChangeLog.md +%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt %{_bindir}/[a-z]* %{_mandir}/man[145]/[a-z]* %{_mandir}/man1/%{name}.*
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/Install-vms.txt ^
@@ -13,7 +13,7 @@ where node_name is the DECNET X server to contact. - Note : the MAKE.COM files compile every thing with /name=(as_is,short). all + Note : the MAKE.COM files compile everything with /name=(as_is,short). all the requested graphical lib's should be compiled with this qualifier (see http://nchrem.tnw.tudelft/openvms for details on additional libraries needed). All the .olb files of the libs are expected to be in SYS$LIBRARY.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/Magick++/lib/Drawable.cpp ^
@@ -2491,12 +2491,3 @@ { return new PathMovetoRel(*this); } - -#if defined(EXPLICIT_TEMPLATE_INSTANTIATION) -// template class std::vector<Magick::Coordinate>; -// template class std::vector<const Magick::Drawable>; -// template class std::vector<const Magick::PathArcArgs>; -// template class std::vector<const Magick::PathCurvetoArgs>; -// template class std::vector<const Magick::PathQuadraticCurvetoArgs>; -// template class std::vector<const Magick::VPath>; -#endif
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/Magick++/lib/Image.cpp ^
@@ -3153,7 +3153,8 @@ drawInfo->text=DestroyString(drawInfo->text); drawInfo->text=const_cast<char >(text_.c_str()); GetPPException; - GetMultilineTypeMetrics(image(),drawInfo,&(metrics->_typeMetric),exceptionInfo); + (void) GetMultilineTypeMetrics(image(),drawInfo,&(metrics->_typeMetric), + exceptionInfo); drawInfo->text=(char ) NULL; ThrowImageException; }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/Makefile.am ^
@@ -48,6 +48,10 @@ MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICK_DEP_LIBS) endif # WITH_MODULES +if WIN32_NATIVE_BUILD +MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD += -lws2_32 +endif + nodist_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBRARY_EXTRA_CPPFLAGS)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/accelerate.c ^
@@ -661,7 +661,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); device=RequestOpenCLDevice(clEnv); @@ -796,7 +796,7 @@ assert(image != NULL); assert(exception != (ExceptionInfo ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (checkAccelerateCondition(image) == MagickFalse) @@ -853,7 +853,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); contrastKernel=NULL; @@ -919,7 +919,7 @@ assert(image != NULL); assert(exception != (ExceptionInfo ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (checkAccelerateCondition(image) == MagickFalse) @@ -1011,7 +1011,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); histogram=NULL; @@ -1482,7 +1482,7 @@ assert(image != NULL); assert(exception != (ExceptionInfo ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((checkAccelerateConditionRGBA(image) == MagickFalse) \|\| @@ -2332,7 +2332,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); map=NULL; @@ -2691,7 +2691,7 @@ assert(image != NULL); assert(exception != (ExceptionInfo ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((checkAccelerateConditionRGBA(image) == MagickFalse) \|\| @@ -2754,7 +2754,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); outputReady=MagickFalse; @@ -2843,7 +2843,7 @@ assert(image != NULL); assert(exception != (ExceptionInfo ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (checkAccelerateCondition(image) == MagickFalse) @@ -2902,7 +2902,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); outputReady=MagickFalse; @@ -2970,7 +2970,7 @@ assert(image != NULL); assert(exception != (ExceptionInfo ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((checkAccelerateCondition(image) == MagickFalse) \|\| @@ -3405,7 +3405,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); inputPixels = NULL; @@ -3539,7 +3539,7 @@ assert(image != NULL); assert(exception != (ExceptionInfo ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (checkAccelerateConditionRGBA(image) == MagickFalse) @@ -3641,7 +3641,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); outputReady = MagickFalse; @@ -4570,7 +4570,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); filteredImage=NULL; @@ -4697,7 +4697,7 @@ assert(image != NULL); assert(exception != (ExceptionInfo *) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (checkAccelerateCondition(image) == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/animate.c ^
@@ -300,7 +300,7 @@ assert(image_info->signature == MagickCoreSignature); assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); display=XOpenDisplay(image_info->server_name); if (display == (Display ) NULL) @@ -523,8 +523,6 @@ state&=(~ForwardAnimationState); if (command_type == StepForwardCommand) state\|=ForwardAnimationState; - if (resource_info->title != (char ) NULL) - break; break; } case RepeatCommand: @@ -797,7 +795,7 @@ / assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); resources=(resource_info); window_info.id=(Window) NULL; @@ -974,7 +972,7 @@ images->filename); window_info.x=0; window_info.y=0; - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) { (void) LogMagickEvent(X11Event,GetMagickModule(), "Image: %s[%.20g] %.20gx%.20g ",image_list[0]->filename,(double) @@ -1097,7 +1095,7 @@ if (status == MagickFalse) ThrowXWindowFatalException(XServerFatalError,"UnableToCreateXImage", images->filename); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) { (void) LogMagickEvent(X11Event,GetMagickModule(), "Image: [%.20g] %s %.20gx%.20g ",(double) image_list[scene]->scene, @@ -1412,7 +1410,7 @@ assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); warning_handler=(WarningHandler) NULL; windows=XSetWindows((XWindows ) ~0); @@ -1553,7 +1551,7 @@ (display_image->rows < image_list[scene]->rows)) display_image=image_list[scene]; } - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) { (void) LogMagickEvent(X11Event,GetMagickModule(), "Image: %s[%.20g] %.20gx%.20g ",display_image->filename,(double) @@ -1582,7 +1580,7 @@ manager_hints->initial_state=WithdrawnState; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->context); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (context)",windows->context.id); context_values.background=pixel->background_color.pixel; @@ -1633,7 +1631,7 @@ manager_hints->initial_state=IconicState; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->icon); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (icon)", windows->icon.id); /* @@ -1731,7 +1729,7 @@ resource_info->iconic ? IconicState : NormalState; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->backdrop); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (backdrop)",windows->backdrop.id); (void) XMapWindow(display,windows->backdrop.id); @@ -1763,7 +1761,7 @@ manager_hints->flags\|=(MagickStatusType) WindowGroupHint; manager_hints->window_group=windows->group_leader.id; (void) XSelectInput(display,windows->group_leader.id,StructureNotifyMask); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (group leader)",windows->group_leader.id); } @@ -1775,7 +1773,7 @@ if (windows->group_leader.id != (Window) NULL) (void) XSetTransientForHint(display,windows->image.id, windows->group_leader.id); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (image)", windows->image.id); /* @@ -1805,7 +1803,7 @@ (void) XSetTransientForHint(display,windows->info.id,windows->image.id); if (windows->image.mapped) (void) XWithdrawWindow(display,windows->info.id,windows->info.screen); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (info)", windows->info.id); /* @@ -1837,7 +1835,7 @@ windows->command.shadow_stipple=XCreateBitmapFromData(display, windows->command.id,(char ) ShadowBitmap,ShadowWidth,ShadowHeight); (void) XSetTransientForHint(display,windows->command.id,windows->image.id); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (command)",windows->command.id); / @@ -1866,7 +1864,7 @@ windows->widget.shadow_stipple=XCreateBitmapFromData(display, windows->widget.id,(char ) ShadowBitmap,ShadowWidth,ShadowHeight); (void) XSetTransientForHint(display,windows->widget.id,windows->image.id); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (widget)",windows->widget.id); / @@ -1890,7 +1888,7 @@ windows->popup.shadow_stipple=XCreateBitmapFromData(display, windows->popup.id,(char ) ShadowBitmap,ShadowWidth,ShadowHeight); (void) XSetTransientForHint(display,windows->popup.id,windows->image.id); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (pop up)",windows->popup.id); / @@ -2138,8 +2136,11 @@ / XGetPixelInfo(display,visual_info,map_info,resource_info, image_list[scene],windows->image.pixel_info); - windows->image.ximage->width=(int) image->columns; - windows->image.ximage->height=(int) image->rows; + if (image != (Image ) NULL) + { + windows->image.ximage->width=(int) image->columns; + windows->image.ximage->height=(int) image->rows; + } windows->image.pixmap=windows->image.pixmaps[scene]; windows->image.matte_pixmap=windows->image.matte_pixmaps[scene]; event.xexpose.x=0; @@ -2224,7 +2225,7 @@ { case ButtonPress: { - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Press: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -2267,7 +2268,7 @@ } case ButtonRelease: { - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Release: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -2275,7 +2276,7 @@ } case ClientMessage: { - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Client Message: 0x%lx 0x%lx %d 0x%lx",(unsigned long) event.xclient.window,(unsigned long) event.xclient.message_type, @@ -2404,7 +2405,7 @@ } case ConfigureNotify: { - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Configure Notify: 0x%lx %dx%d+%d+%d %d",event.xconfigure.window, event.xconfigure.width,event.xconfigure.height,event.xconfigure.x, @@ -2470,7 +2471,7 @@ /* Group leader has exited. */ - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/annotate.c ^
@@ -261,7 +261,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(draw_info != (DrawInfo ) NULL); assert(draw_info->signature == MagickCoreSignature); @@ -779,7 +779,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(draw_info != (DrawInfo ) NULL); assert(draw_info->text != (char ) NULL); @@ -905,7 +905,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(draw_info != (DrawInfo ) NULL); assert(draw_info->text != (char ) NULL); @@ -917,7 +917,7 @@ offset.x=0.0; offset.y=0.0; status=RenderType(image,annotate_info,&offset,metrics,exception); - if (image->debug != MagickFalse) + if (draw_info->debug != MagickFalse) (void) LogMagickEvent(AnnotateEvent,GetMagickModule(),"Metrics: text: %s; " "width: %g; height: %g; ascent: %g; descent: %g; max advance: %g; " "bounds: %g,%g %g,%g; origin: %g,%g; pixels per em: %g,%g; " @@ -1219,9 +1219,6 @@ const char p; - FT_Error - ft_status; - ssize_t i; @@ -1247,6 +1244,9 @@ { if (FT_HAS_KERNING(face)) { + FT_Error + ft_status; + FT_Vector kerning; @@ -1257,7 +1257,7 @@ RightToLeftDirection ? -1.0 : 1.0)kerning.x); } } - ft_status=FT_Load_Glyph(face,(FT_UInt) (grapheme)[i].index,flags); + (void) FT_Load_Glyph(face,(FT_UInt) (grapheme)[i].index,flags); (grapheme)[i].x_advance=face->glyph->advance.x; (grapheme)[i].cluster=p-text; last_glyph=(grapheme)[i].index; @@ -1266,6 +1266,27 @@ #endif } +static void FTCloseStream(FT_Stream stream) +{ + FILE file = (FILE ) stream->descriptor.pointer; + if (file != (FILE ) NULL) + (void) fclose(file); + stream->descriptor.pointer=NULL; +} + +static unsigned long FTReadStream(FT_Stream stream,unsigned long offset, + unsigned char buffer,unsigned long count) +{ + FILE file = (FILE ) stream->descriptor.pointer; + if (file == (FILE ) NULL) + return(0); + if (count == 0) + return(0); + if (fseek(file,(off_t) offset,SEEK_SET) != 0) + return(0); + return((unsigned long) fread(buffer,1,count,file)); +} + static inline MagickBooleanType IsEmptyOutline(FT_Outline outline) { return((outline.n_points == 0) \|\| (outline.n_contours <= 0) ? MagickTrue : @@ -1336,6 +1357,16 @@ return(0); } +static inline const char FreetypeErrorMessage(FT_Error ft_status) +{ +#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 10 + return(FT_Error_String(ft_status)); +#else + magick_unreferenced(ft_status); + return((const char ) NULL); +#endif +} + static MagickBooleanType RenderFreetype(Image image,const DrawInfo draw_info, const char encoding,const PointInfo offset,TypeMetric metrics, ExceptionInfo exception) @@ -1344,6 +1375,18 @@ #define FT_OPEN_PATHNAME ft_open_pathname #endif +#define ThrowFreetypeErrorException(tag,ft_status,value) \ +{ \ + const char \ + error_string=FreetypeErrorMessage(ft_status); \ + if (error_string != (const char ) NULL) \ + (void) ThrowMagickException(exception,GetMagickModule(),TypeError, \ + tag,"`%s (%s)'",value, error_string); \ + else \ + (void) ThrowMagickException(exception,GetMagickModule(),TypeError, \ + tag,"`%s'",value); \ +} + typedef struct _GlyphInfo { FT_UInt @@ -1356,6 +1399,9 @@ image; } GlyphInfo; + char + p; + const char value; @@ -1392,6 +1438,9 @@ FT_Open_Args args; + FT_StreamRec + stream; + FT_UInt first_glyph_id, last_glyph_id, @@ -1413,9 +1462,6 @@ point, resolution; - char - p; - ssize_t i; @@ -1437,6 +1483,9 @@ 0, 0 }; + struct stat + attributes; + unsigned char utf8; @@ -1445,10 +1494,13 @@ / ft_status=FT_Init_FreeType(&library); if (ft_status != 0) - ThrowBinaryException(TypeError,"UnableToInitializeFreetypeLibrary", + ThrowFreetypeErrorException("UnableToInitializeFreetypeLibrary",ft_status, image->filename); + /* + Open font face. + / face_index=(FT_Long) draw_info->face; - args.flags=FT_OPEN_PATHNAME; + (void) memset(&args,0,sizeof(args)); if (draw_info->font == (char ) NULL) args.pathname=ConstantString("helvetica"); else @@ -1459,20 +1511,31 @@ /* Extract face index, e.g. @msgothic[1]. / - ImageInfo image_info=AcquireImageInfo(); + ImageInfo image_info = AcquireImageInfo(); (void) strcpy(image_info->filename,draw_info->font+1); (void) SetImageInfo(image_info,0,exception); face_index=(FT_Long) image_info->scene; args.pathname=ConstantString(image_info->filename); image_info=DestroyImageInfo(image_info); } + / + Configure streaming interface. + */
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/artifact.c ^
@@ -104,13 +104,14 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(clone_image != (const Image ) NULL); assert(clone_image->signature == MagickCoreSignature); - if (clone_image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - clone_image->filename); + if (IsEventLogging() != MagickFalse) + { + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + clone_image->filename); + } if (clone_image->artifacts != (void ) NULL) { if (image->artifacts != (void ) NULL) @@ -200,7 +201,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->artifacts == (void ) NULL) return(MagickFalse); @@ -234,7 +235,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->artifacts != (void ) NULL) image->artifacts=(void ) DestroySplayTree((SplayTreeInfo ) @@ -278,7 +279,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); p=(const char ) NULL; if (image->artifacts != (void ) NULL) @@ -324,7 +325,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->artifacts == (void ) NULL) return((const char ) NULL); @@ -367,7 +368,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->artifacts == (void ) NULL) return((char ) NULL); @@ -407,7 +408,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->artifacts == (void ) NULL) return; @@ -453,7 +454,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); /* Create tree if needed - specify how key,values are to be freed.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/attribute.c ^
@@ -197,6 +197,8 @@ break; } } + if (p == (const Quantum ) NULL) + return(0.0); GetPixelInfoPixel(image,p,&background); artifact=GetImageArtifact(image,"background"); if (artifact != (const char ) NULL) @@ -274,7 +276,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); SetGeometry(image,&bounds); edge_image=CloneImage(image,0,0,MagickTrue,exception); @@ -413,7 +415,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); artifact=GetImageArtifact(image,"trim:percent-background"); if (artifact != (const char ) NULL) @@ -792,7 +794,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); number_vertices=0; vertices_info=AcquireVirtualMemory(image->columns,image->rows @@ -908,7 +910,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); number_threads=(size_t) GetMagickResourceLimit(ThreadResource); current_depth=(size_t ) AcquireQuantumMemory(number_threads, @@ -1225,7 +1227,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); number_vertices=0; vertices=GetImageConvexHull(image,&number_hull_vertices,exception); @@ -1578,7 +1580,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (IsImageGray(image) != MagickFalse) return(image->type); @@ -1659,7 +1661,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->type == BilevelType) return(MagickTrue); @@ -1728,7 +1730,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->colorspace == CMYKColorspace) { @@ -1861,7 +1863,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->alpha_trait == UndefinedPixelTrait) return(MagickTrue); @@ -1929,7 +1931,7 @@ y; assert(image != (Image ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->signature == MagickCoreSignature); if (depth >= MAGICKCORE_QUANTUM_DEPTH) @@ -2145,7 +2147,7 @@ quantize_info; assert(image != (Image ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->signature == MagickCoreSignature); status=MagickTrue;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/blob.c ^
@@ -265,7 +265,7 @@ const size_t length) { assert(blob_info != (BlobInfo ) NULL); - if (blob_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); blob_info->length=length; blob_info->extent=length; @@ -308,7 +308,7 @@ assert(blob_info != (BlobInfo ) NULL); assert(custom_stream != (CustomStreamInfo ) NULL); assert(custom_stream->signature == MagickCoreSignature); - if (blob_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); blob_info->type=CustomStream; blob_info->custom_stream=custom_stream; @@ -357,8 +357,9 @@ count; assert(filename != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); assert(blob != (const void ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); if (filename == '\0') file=AcquireUniqueFileResource(filename); else @@ -437,10 +438,10 @@ assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - assert(exception != (ExceptionInfo ) NULL); if ((blob == (const void ) NULL) \|\| (length == 0)) { (void) ThrowMagickException(exception,GetMagickModule(),BlobError, @@ -609,7 +610,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); blob_info=image->blob; if ((blob_info == (BlobInfo ) NULL) \|\| (blob_info->type == UndefinedStream)) @@ -696,7 +697,7 @@ break; case FileStream: { - if (fileno(blob_info->file_info.file) != -1) + if (blob_info->file_info.file != (FILE ) NULL) { status=fclose(blob_info->file_info.file); if (status != 0) @@ -788,13 +789,13 @@ assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(image_info->custom_stream != (CustomStreamInfo ) NULL); assert(image_info->custom_stream->signature == MagickCoreSignature); assert(image_info->custom_stream->reader != (CustomStreamHandler) NULL); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); blob_info=CloneImageInfo(image_info); if (blob_info->magick == '\0') (void) SetImageInfo(blob_info,0,exception); @@ -940,10 +941,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(image->blob != (BlobInfo ) NULL); assert(image->blob->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); blob_info=image->blob; destroy=MagickFalse; LockSemaphoreInfo(blob_info->semaphore); @@ -995,9 +996,10 @@ MagickExport CustomStreamInfo DestroyCustomStreamInfo( CustomStreamInfo custom_stream) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(custom_stream != (CustomStreamInfo ) NULL); assert(custom_stream->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); custom_stream->signature=(~MagickCoreSignature); custom_stream=(CustomStreamInfo ) RelinquishMagickMemory(custom_stream); return(custom_stream); @@ -1031,7 +1033,7 @@ data; assert(blob_info != (BlobInfo ) NULL); - if (blob_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (blob_info->mapped != MagickFalse) { @@ -1089,10 +1091,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(image->blob != (BlobInfo ) NULL); assert(image->blob->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); blob_info=image->blob; clone=MagickFalse; LockSemaphoreInfo(blob_info->semaphore); @@ -1194,10 +1196,10 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(duplicate != (Image ) NULL); assert(duplicate->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); DestroyBlob(image); image->blob=ReferenceBlob(duplicate->blob); } @@ -1232,10 +1234,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->blob != (BlobInfo ) NULL); assert(image->blob->type != UndefinedStream); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); blob_info=image->blob; switch (blob_info->type) { @@ -1312,10 +1314,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->blob != (BlobInfo ) NULL); assert(image->blob->type != UndefinedStream); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); blob_info=image->blob; switch (blob_info->type) { @@ -1418,8 +1420,9 @@ map; assert(filename != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); length=0; status=IsRightsAuthorized(PathPolicyDomain,ReadPolicyRights,filename); if (status == MagickFalse) @@ -1636,7 +1639,8 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); assert(filename != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); status=IsRightsAuthorized(PathPolicyDomain,WritePolicyRights,filename); if (status == MagickFalse) { @@ -1715,7 +1719,7 @@ { assert(image != (const Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((image->blob->status != MagickFalse) && (image->blob->error_number != 0)) errno=image->blob->error_number; @@ -1781,7 +1785,7 @@ blob_info->quantum=(size_t) MagickMaxBlobExtent; blob_info->properties.st_mtime=GetMagickTime(); blob_info->properties.st_ctime=blob_info->properties.st_mtime; - blob_info->debug=IsEventLogging(); + blob_info->debug=GetLogEventMask() & BlobEvent ? MagickTrue : MagickFalse; blob_info->reference_count=1;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/cache-view.c ^
@@ -155,7 +155,7 @@ magick_unreferenced(exception); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); #if defined(MAGICKCORE_OPENCL_SUPPORT) SyncAuthenticOpenCLBuffer(image); @@ -173,7 +173,8 @@ cache_view->number_threads=1; cache_view->nexus_info=AcquirePixelCacheNexus(cache_view->number_threads); cache_view->virtual_pixel_method=GetImageVirtualPixelMethod(image); - cache_view->debug=IsEventLogging(); + cache_view->debug=(GetLogEventMask() & CacheEvent) != 0 ? MagickTrue : + MagickFalse; cache_view->signature=MagickCoreSignature; if (cache_view->nexus_info == (NexusInfo ) NULL) ThrowFatalException(CacheFatalError,"UnableToAcquireCacheView"); @@ -209,7 +210,7 @@ assert(cache_view != (CacheView ) NULL); assert(cache_view->signature == MagickCoreSignature); - if (cache_view->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_view->image->filename); clone_view=(CacheView ) MagickAssumeAligned(AcquireAlignedMemory(1, @@ -253,7 +254,7 @@ { assert(cache_view != (CacheView ) NULL); assert(cache_view->signature == MagickCoreSignature); - if (cache_view->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_view->image->filename); if (cache_view->nexus_info != (NexusInfo *) NULL) @@ -415,7 +416,7 @@ { assert(cache_view != (CacheView ) NULL); assert(cache_view->signature == MagickCoreSignature); - if (cache_view->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_view->image->filename); return(GetPixelCacheColorspace(cache_view->image->cache)); @@ -455,7 +456,7 @@ assert(cache_view != (CacheView ) NULL); assert(cache_view->signature == MagickCoreSignature); - if (cache_view->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_view->image->filename); assert(cache_view->image->cache != (Cache) NULL); @@ -491,7 +492,7 @@ { assert(cache_view != (CacheView ) NULL); assert(cache_view->signature == MagickCoreSignature); - if (cache_view->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_view->image->filename); return(cache_view->image); @@ -524,7 +525,7 @@ { assert(cache_view != (CacheView ) NULL); assert(cache_view->signature == MagickCoreSignature); - if (cache_view->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_view->image->filename); return(GetPixelCacheStorageClass(cache_view->image->cache)); @@ -1025,7 +1026,7 @@ { assert(cache_view != (CacheView ) NULL); assert(cache_view->signature == MagickCoreSignature); - if (cache_view->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_view->image->filename); return(SetImageStorageClass(cache_view->image,storage_class,exception)); @@ -1063,7 +1064,7 @@ { assert(cache_view != (CacheView *) NULL); assert(cache_view->signature == MagickCoreSignature); - if (cache_view->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_view->image->filename); cache_view->virtual_pixel_method=virtual_pixel_method;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/cache.c ^
@@ -231,7 +231,8 @@ cache_info->semaphore=AcquireSemaphoreInfo(); cache_info->reference_count=1; cache_info->file_semaphore=AcquireSemaphoreInfo(); - cache_info->debug=IsEventLogging(); + cache_info->debug=(GetLogEventMask() & CacheEvent) != 0 ? MagickTrue : + MagickFalse; cache_info->signature=MagickCoreSignature; return((Cache ) cache_info); } @@ -430,7 +431,7 @@ /* Apply clip mask. / - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((image->channels & WriteMaskChannel) == 0) return(MagickTrue); @@ -513,7 +514,7 @@ assert(cache != NULL); cache_info=(const CacheInfo ) cache; assert(cache_info->signature == MagickCoreSignature); - if (cache_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_info->filename); clone_info=(CacheInfo ) AcquirePixelCache(cache_info->number_threads); @@ -555,7 +556,7 @@ assert(clone != (Cache) NULL); source_info=(CacheInfo ) clone; assert(source_info->signature == MagickCoreSignature); - if (source_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", source_info->filename); assert(cache != (Cache) NULL); @@ -580,14 +581,14 @@ % % The format of the ClonePixelCacheRepository() method is: % -% MagickBooleanType ClonePixelCacheRepository(CacheInfo cache_info, -% CacheInfo source_info,ExceptionInfo exception) +% MagickBooleanType ClonePixelCacheRepository(CacheInfo clone_info, +% CacheInfo cache_info,ExceptionInfo exception) % % A description of each parameter follows: % -% o cache_info: the pixel cache. +% o clone_info: the pixel cache. % -% o source_info: the source pixel cache. +% o cache_info: the source pixel cache. % % o exception: return any errors or warnings in this structure. % @@ -887,7 +888,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->cache != (void ) NULL) image->cache=DestroyPixelCache(image->cache); @@ -922,7 +923,7 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(image->cache != (Cache) NULL); cache_info=(CacheInfo ) image->cache; @@ -1038,7 +1039,7 @@ assert(cache != (Cache) NULL); cache_info=(CacheInfo ) cache; assert(cache_info->signature == MagickCoreSignature); - if (cache_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_info->filename); LockSemaphoreInfo(cache_info->semaphore); @@ -1608,7 +1609,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(image->cache != (Cache) NULL); cache_info=(CacheInfo ) image->cache; @@ -2165,7 +2166,7 @@ assert(cache != (Cache) NULL); cache_info=(CacheInfo ) cache; assert(cache_info->signature == MagickCoreSignature); - if (cache_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_info->filename); return(cache_info->colorspace); @@ -2370,7 +2371,7 @@ assert(cache != (Cache) NULL); cache_info=(CacheInfo ) cache; assert(cache_info->signature == MagickCoreSignature); - if (cache_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", cache_info->filename); return(cache_info->storage_class); @@ -2411,7 +2412,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); cache_info=(CacheInfo ) image->cache; assert(cache_info->signature == MagickCoreSignature); @@ -2703,9 +2704,12 @@ modulo; modulo.quotient=offset; + modulo.remainder=0; if (extent != 0) - modulo.quotient=offset/((ssize_t) extent); - modulo.remainder=offset % ((ssize_t) extent); + { + modulo.quotient=offset/((ssize_t) extent); + modulo.remainder=offset % ((ssize_t) extent); + } if ((modulo.remainder != 0) && ((offset ^ ((ssize_t) extent)) < 0)) { modulo.quotient-=1; @@ -3416,7 +3420,7 @@ / Apply composite mask. / - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((image->channels & CompositeMaskChannel) == 0) return(MagickTrue); @@ -3585,7 +3589,7 @@ offset; cache_info=(CacheInfo ) image->cache; - if (image->debug != MagickFalse) + if (cache_info->debug != MagickFalse) { char format[MagickPathExtent], @@ -3652,7 +3656,7 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); assert(image->cache != (Cache) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (cache_anonymous_memory < 0) { @@ -3774,7 +3778,7 @@ exception); RelinquishPixelCachePixels(&source_info); } - if (image->debug != MagickFalse) + if (cache_info->debug != MagickFalse) { (void) FormatMagickSize(cache_info->length,MagickTrue,"B", MagickPathExtent,format); @@ -3840,7 +3844,7 @@ exception); RelinquishPixelCachePixels(&source_info); } - if (image->debug != MagickFalse) + if (cache_info->debug != MagickFalse) { (void) FormatMagickSize(cache_info->length,MagickFalse,"B", MagickPathExtent,format); @@ -3936,7 +3940,7 @@ exception); RelinquishPixelCachePixels(&source_info); } - if (image->debug != MagickFalse) + if (cache_info->debug != MagickFalse) { (void) FormatMagickSize(cache_info->length,MagickTrue,"B", MagickPathExtent,format); @@ -3966,7 +3970,7 @@ status=ClonePixelCacheRepository(cache_info,&source_info,exception); RelinquishPixelCachePixels(&source_info); } - if (image->debug != MagickFalse) + if (cache_info->debug != MagickFalse) { (void) FormatMagickSize(cache_info->length,MagickFalse,"B", MagickPathExtent,format); @@ -4040,7 +4044,7 @@ assert(image != (Image ) NULL);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/channel.c ^
@@ -228,7 +228,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); @@ -512,7 +512,7 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); @@ -670,7 +670,7 @@ MagickExport MagickBooleanType GetImageAlphaChannel(const Image image) { assert(image != (const Image ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->signature == MagickCoreSignature); return(image->alpha_trait != UndefinedPixelTrait ? MagickTrue : MagickFalse); @@ -731,7 +731,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); @@ -856,7 +856,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); images=NewImageList(); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) @@ -983,7 +983,7 @@ y; assert(image != (Image ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->signature == MagickCoreSignature); status=MagickTrue;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/cipher.c ^
@@ -232,9 +232,10 @@ / static AESInfo DestroyAESInfo(AESInfo aes_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(aes_info != (AESInfo ) NULL); assert(aes_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (aes_info->decipher_key != (unsigned int ) NULL) aes_info->decipher_key=(unsigned int ) RelinquishMagickMemory( aes_info->decipher_key); @@ -606,10 +607,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (passkey == (const StringInfo ) NULL) return(MagickTrue); aes_info=AcquireAESInfo(); @@ -819,10 +820,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (passkey == (const StringInfo ) NULL) return(MagickTrue); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) @@ -1010,10 +1011,11 @@ /* Determine the number of rounds based on the number of bits in key. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(aes_info != (AESInfo ) NULL); assert(aes_info->signature == MagickCoreSignature); assert(key != (StringInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); n=4; aes_info->rounds=10; if ((8GetStringInfoLength(key)) >= 256) @@ -1111,10 +1113,10 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) passphrase; ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename); } @@ -1124,10 +1126,10 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) passkey; ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename); } @@ -1167,10 +1169,10 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) passphrase; ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename); } @@ -1180,10 +1182,10 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) passkey; ThrowBinaryException(ImageError,"CipherSupportNotEnabled",image->filename); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/client.c ^
@@ -17,7 +17,7 @@ % March 2003 % % % % % -% Copyright @ 2003 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may %
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/coder.c ^
@@ -332,8 +332,9 @@ Allocate coder list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_coders != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_coders=0; p=GetCoderInfo("",exception); if (p == (const CoderInfo ) NULL) @@ -417,8 +418,9 @@ Allocate coder list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_coders != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_coders=0; p=GetCoderInfo("",exception); if (p == (const CoderInfo ) NULL)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/color.c ^
@@ -1297,8 +1297,9 @@ Allocate color list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_colors != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_colors=0; p=GetColorInfo("",exception); if (p == (const ColorInfo ) NULL) @@ -1390,8 +1391,9 @@ Allocate color list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_colors != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_colors=0; p=GetColorInfo("",exception); if (p == (const ColorInfo ) NULL) @@ -1525,7 +1527,8 @@ assert(pixel != (const PixelInfo ) NULL); assert(tuple != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tuple); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tuple); tuple='\0'; if (hex != MagickFalse) { @@ -1734,13 +1737,13 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(target_image != (Image ) NULL); assert(target_image->signature == MagickCoreSignature); assert(x_offset != (ssize_t ) NULL); assert(y_offset != (ssize_t ) NULL); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); x=0; status=MagickTrue; GetPixelInfo(image,&pixel); @@ -2291,7 +2294,8 @@ assert(color != (PixelInfo ) NULL); if ((name == (char ) NULL) \|\| (*name == '\0')) name=BackgroundColor; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",name); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",name); if (strlen(name) > MagickPathExtent) { (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/colormap.c ^
@@ -113,7 +113,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (colors > MaxColormapSize) { @@ -198,7 +198,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == DirectClass) (void) SetImageType(image,PaletteType,exception); @@ -313,9 +313,9 @@ pixels; assert(image != (Image ) NULL); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (image->storage_class != PseudoClass) return(MagickTrue); /
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/colorspace.c ^
@@ -129,7 +129,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); colorspace=image->colorspace; type=IdentifyImageType(image,exception); @@ -484,11 +484,11 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(colorspace != sRGBColorspace); assert(colorspace != TransparentColorspace); assert(colorspace != UndefinedColorspace); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); artifact=GetImageArtifact(image,"color:illuminant"); if (artifact != (const char ) NULL) { @@ -1426,10 +1426,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->colorspace == colorspace) return(MagickTrue); image->colorspace=colorspace; @@ -1506,7 +1506,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (IsImageGray(image) != MagickFalse) return(MagickTrue); @@ -1560,7 +1560,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (IsImageMonochrome(image) != MagickFalse) return(MagickTrue); @@ -1612,7 +1612,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->colorspace == colorspace) return(SetImageColorspace(image,colorspace,exception)); @@ -2066,7 +2066,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); artifact=GetImageArtifact(image,"color:illuminant"); if (artifact != (const char ) NULL)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/compare.c ^
@@ -17,7 +17,7 @@ % December 2003 % % % % % -% Copyright @ 2003 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -148,14 +148,12 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(reconstruct_image != (const Image ) NULL); assert(reconstruct_image->signature == MagickCoreSignature); assert(distortion != (double ) NULL); - distortion=0.0; - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); + distortion=0.0; status=GetImageDistortion(image,reconstruct_image,metric,distortion, exception); if (status == MagickFalse) @@ -1111,8 +1109,9 @@ channels++; } } - distortion[CompositePixelChannel]=sqrt(distortion[CompositePixelChannel]/ - channels); + if (channels != 0) + distortion[CompositePixelChannel]=sqrt(distortion[CompositePixelChannel]/ + channels); / Free resources. / @@ -1622,14 +1621,12 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(reconstruct_image != (const Image ) NULL); assert(reconstruct_image->signature == MagickCoreSignature); assert(distortion != (double ) NULL); - distortion=0.0; - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); + distortion=0.0; /* Get image distortion. / @@ -1770,11 +1767,9 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(reconstruct_image != (const Image ) NULL); assert(reconstruct_image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); / Get image distortion. @@ -2726,7 +2721,6 @@ } static Image NCCSimilarityImage(const Image image,const Image reference, - const MetricType metric,const double similarity_threshold, RectangleInfo offset,double similarity_metric,ExceptionInfo exception) { #define DestroySimilarityResources() \ @@ -2788,7 +2782,7 @@ Compute the cross correlation of the square and unity images. / ncc_image=CrossCorrelationImage(square_image,unity_image,exception); - square_image=DestroyImage(square_image); \ + square_image=DestroyImage(square_image); if (ncc_image == (Image ) NULL) ThrowSimilarityException(); status=NCCMultiplyImage(ncc_image,(double) QuantumRangereference->columns @@ -2926,26 +2920,27 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); assert(offset != (RectangleInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); SetGeometry(reference,offset); similarity_metric=MagickMaximumValue; #if defined(MAGICKCORE_HDRI_SUPPORT) && defined(MAGICKCORE_FFTW_DELEGATE) - { - const char artifact = GetImageArtifact(image,"compare:accelerate-ncc"); - MagickBooleanType accelerate = (artifact != (const char ) NULL) && - (IsStringTrue(artifact) == MagickFalse) ? MagickFalse : MagickTrue; - if ((accelerate != MagickFalse) && - (metric == NormalizedCrossCorrelationErrorMetric)) - { - similarity_image=NCCSimilarityImage(image,reference,metric, - similarity_threshold,offset,similarity_metric,exception); - return(similarity_image); - } - } + if ((image->channels & ReadMaskChannel) != 0) + { + const char artifact = GetImageArtifact(image,"compare:accelerate-ncc"); + MagickBooleanType accelerate = (artifact != (const char ) NULL) && + (IsStringTrue(artifact) == MagickFalse) ? MagickFalse : MagickTrue; + if ((accelerate != MagickFalse) && + (metric == NormalizedCrossCorrelationErrorMetric)) + { + similarity_image=NCCSimilarityImage(image,reference,offset, + similarity_metric,exception); + return(similarity_image); + } + } #endif similarity_image=CloneImage(image,image->columns-reference->columns+1, image->rows-reference->rows+1,MagickTrue,exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/composite.c ^
@@ -1568,10 +1568,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(composite != (Image ) NULL); assert(composite->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); source_image=CloneImage(composite,0,0,MagickTrue,exception); @@ -2137,6 +2137,8 @@ canvas_dissolve=geometry_info.sigma/100.0; if ((canvas_dissolve-MagickEpsilon) < 0.0) canvas_dissolve=0.0; + if ((canvas_dissolve+MagickEpsilon) > 1.0) + canvas_dissolve=1.0; } break; } @@ -2275,12 +2277,12 @@ pixels; MagickRealType - blue, - chroma, - green, - hue, - luma, - red; + blue = 0.0, + chroma = 0.0, + green = 0.0, + hue = 0.0, + luma = 0.0, + red = 0.0; PixelInfo canvas_pixel, @@ -2328,26 +2330,25 @@ status=MagickFalse; continue; } - hue=0.0; - chroma=0.0; - luma=0.0; GetPixelInfo(image,&canvas_pixel); GetPixelInfo(source_image,&source_pixel); for (x=0; x < (ssize_t) image->columns; x++) { double - gamma; + gamma = 0.0; MagickRealType - alpha, - Da, - Dc, - Dca, - DcaDa, - Sa, - SaSca, - Sc, - Sca; + alpha = 0.0, + Da = 0.0, + Dc = 0.0, + Dca = 0.0, + DcaDa = 0.0, + Di = 0.0, + Sa = 0.0, + SaSca = 0.0, + Sc = 0.0, + Sca = 0.0, + Si = 0.0; ssize_t i; @@ -2381,11 +2382,11 @@ for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { MagickRealType - pixel; + pixel = 0.0; PixelChannel channel = GetPixelChannelChannel(image,i); PixelTrait traits = GetPixelChannelTraits(image,channel); - PixelTrait source_traits=GetPixelChannelTraits(source_image, + PixelTrait source_traits = GetPixelChannelTraits(source_image, channel); if ((traits == UndefinedPixelTrait) \|\| (source_traits == UndefinedPixelTrait)) @@ -2562,18 +2563,28 @@ case RMSECompositeOp: case SaturateCompositeOp: { + Si=GetPixelIntensity(source_image,p); GetPixelInfoPixel(source_image,p,&source_pixel); GetPixelInfoPixel(image,q,&canvas_pixel); break; } + case BumpmapCompositeOp: + case CopyAlphaCompositeOp: + case DarkenIntensityCompositeOp: + case LightenIntensityCompositeOp: + { + Si=GetPixelIntensity(source_image,p); + Di=GetPixelIntensity(image,q); + break; + } default: break; } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { MagickRealType - pixel, - sans; + pixel = 0.0, + sans = 0.0; PixelChannel channel = GetPixelChannelChannel(image,i); PixelTrait traits = GetPixelChannelTraits(image,channel); @@ -2610,7 +2621,7 @@ } case BumpmapCompositeOp: { - pixel=GetPixelIntensity(source_image,p)Da; + pixel=SiDa; break; } case ChangeMaskCompositeOp: @@ -2653,7 +2664,7 @@ case CopyAlphaCompositeOp: { if (source_image->alpha_trait == UndefinedPixelTrait) - pixel=GetPixelIntensity(source_image,p); + pixel=Si; else pixel=QuantumRangeSa; break; @@ -2673,12 +2684,10 @@ { if (compose_sync == MagickFalse) { - pixel=GetPixelIntensity(source_image,p) < - GetPixelIntensity(image,q) ? Sa : Da; + pixel=Si < Di? Sa : Da; break; } - pixel=SaGetPixelIntensity(source_image,p) < - DaGetPixelIntensity(image,q) ? Sa : Da; + pixel=SaSi < DaDi ? Sa : Da; break; } case DifferenceCompositeOp: @@ -2704,12 +2713,10 @@ { if (compose_sync == MagickFalse) { - pixel=GetPixelIntensity(source_image,p) > - GetPixelIntensity(image,q) ? Sa : Da; + pixel=Si > Di ? Sa : Da; break; } - pixel=SaGetPixelIntensity(source_image,p) > - DaGetPixelIntensity(image,q) ? Sa : Da; + pixel=SaSi > DaDi ? Sa : Da; break; } case ModulateCompositeOp: @@ -2839,7 +2846,7 @@ pixel=Dc; break; } - pixel=QuantumScaleGetPixelIntensity(source_image,p)Dc; + pixel=QuantumScaleSiDc; break; } case ChangeMaskCompositeOp: @@ -2959,12 +2966,10 @@ { if (compose_sync == MagickFalse) { - pixel=GetPixelIntensity(source_image,p) < - GetPixelIntensity(image,q) ? Sc : Dc; + pixel=Si < Di ? Sc : Dc; break; } - pixel=SaGetPixelIntensity(source_image,p) < - DaGetPixelIntensity(image,q) ? Sc : Dc; + pixel=SaSi < DaDi ? Sc : Dc; break; } case DifferenceCompositeOp: @@ -3171,12 +3176,10 @@ */ if (compose_sync == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/compress.c ^
@@ -279,9 +279,9 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(image->ascii85 != (Ascii85Info ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->ascii85->offset > 0) { image->ascii85->buffer[image->ascii85->offset]='\0'; @@ -446,7 +446,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->blob == (BlobInfo ) NULL) ThrowBinaryException(BlobError,"UnableToOpenBlob",image->filename); @@ -747,7 +747,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(inject_image != (Image ) NULL); assert(inject_image->signature == MagickCoreSignature); @@ -961,11 +961,11 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(pixels != (unsigned char ) NULL); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); table=(TableType ) AcquireQuantumMemory(1UL << 12,sizeof(table)); if (table == (TableType ) NULL) ThrowBinaryException(ResourceLimitWarning,"MemoryAllocationFailed", @@ -1099,9 +1099,9 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(pixels != (unsigned char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); packbits=(unsigned char ) AcquireQuantumMemory(128UL,sizeof(packbits)); if (packbits == (unsigned char ) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", @@ -1253,7 +1253,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); compress_packets=(size_t) (1.001length+12); compress_pixels=(unsigned char ) AcquireQuantumMemory(compress_packets, @@ -1261,6 +1261,7 @@ if (compress_pixels == (unsigned char ) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); + (void) memset(&stream,0,sizeof(stream)); stream.next_in=pixels; stream.avail_in=(unsigned int) length; stream.next_out=compress_pixels; @@ -1295,7 +1296,7 @@ magick_unreferenced(pixels); assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, "DelegateLibrarySupportNotBuiltIn","'%s' (ZIP)",image->filename);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/configure.c ^
@@ -449,8 +449,9 @@ Allocate configure list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_options != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_options=0; p=GetConfigureInfo("",exception); if (p == (const ConfigureInfo ) NULL) @@ -543,8 +544,9 @@ Allocate configure list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_options != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_options=0; p=GetConfigureInfo("",exception); if (p == (const ConfigureInfo ) NULL) @@ -604,7 +606,8 @@ exception; assert(option != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",option); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",option); exception=AcquireExceptionInfo(); configure_info=GetConfigureInfo(option,exception); exception=DestroyExceptionInfo(exception); @@ -659,8 +662,9 @@ xml; assert(filename != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); (void) CopyMagickString(path,filename,MagickPathExtent); / Load XML from configuration files to linked-list. @@ -748,8 +752,9 @@ paths; assert(filename != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); (void) CopyMagickString(path,filename,MagickPathExtent); paths=NewLinkedList(0); { @@ -978,7 +983,8 @@ / MagickExport const char GetConfigureValue(const ConfigureInfo configure_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(configure_info != (ConfigureInfo *) NULL); assert(configure_info->signature == MagickCoreSignature); return(configure_info->value);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/constitute.c ^
@@ -175,10 +175,11 @@ Allocate image structure. / assert(map != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",map); assert(pixels != (void ) NULL); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",map); image=AcquireImage((ImageInfo ) NULL,exception); if (image == (Image ) NULL) return((Image ) NULL); @@ -299,10 +300,10 @@ assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - assert(exception != (ExceptionInfo ) NULL); ping_info=CloneImageInfo(image_info); ping_info->ping=MagickTrue; image=ReadStream(ping_info,&PingStream,exception); @@ -361,10 +362,10 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - assert(exception != (ExceptionInfo ) NULL); (void) SetImageOption(image_info,"filename",filename); (void) CopyMagickString(image_info->filename,filename,MagickPathExtent); (void) InterpretImageFilename(image_info,(Image ) NULL,image_info->filename, @@ -636,7 +637,7 @@ assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); assert(image_info->filename != (char ) NULL); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); assert(exception != (ExceptionInfo ) NULL); @@ -1026,10 +1027,10 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - assert(exception != (ExceptionInfo ) NULL); read_info=CloneImageInfo(image_info); read_info->magick='\0'; (void) SetImageOption(read_info,"filename",filename); @@ -1234,7 +1235,7 @@ assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); assert(image->signature == MagickCoreSignature); @@ -1503,7 +1504,7 @@ assert(image_info->signature == MagickCoreSignature); assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo *) NULL); write_info=CloneImageInfo(image_info);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/decorate.c ^
@@ -113,9 +113,9 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(border_info != (RectangleInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); frame_info.width=image->columns+(border_info->width << 1); frame_info.height=image->rows+(border_info->height << 1); frame_info.x=(ssize_t) border_info->width; @@ -207,9 +207,9 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(frame_info != (FrameInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((frame_info->outer_bevel < 0) \|\| (frame_info->inner_bevel < 0)) ThrowImageException(OptionError,"FrameIsLessThanImageSize"); bevel_width=(size_t) (frame_info->outer_bevel+frame_info->inner_bevel); @@ -642,9 +642,9 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(raise_info != (RectangleInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((image->columns <= (raise_info->width << 1)) \|\| (image->rows <= (raise_info->height << 1))) ThrowBinaryException(OptionError,"ImageSizeMustExceedBevelWidth",
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/delegate-private.h ^
@@ -69,6 +69,9 @@ (MagickDLLCall run_string)(gs_main_instance ,const char ,int,int ); int + (MagickDLLCall* set_arg_encoding)(gs_main_instance, int); + + int (MagickDLLCall set_stdio)(gs_main_instance ,int(MagickDLLCall )(void , char ,int),int(MagickDLLCall )(void ,const char ,int), int(MagickDLLCall )(void ,const char ,int));
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/delegate.c ^
@@ -588,11 +588,10 @@ const char string; - if ((image != (Image ) NULL) && (image->debug != MagickFalse)) + if ((image != (Image ) NULL) && (IsEventLogging() != MagickFalse)) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); else - if ((image_info != (ImageInfo ) NULL) && - (image_info->debug != MagickFalse)) + if ((image_info != (ImageInfo ) NULL) && (IsEventLogging() != MagickFalse)) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s","no-images"); / Get properties that are directly defined by images. @@ -979,10 +978,10 @@ assert(image == NULL \|\| image->signature == MagickCoreSignature); assert(image_info == NULL \|\| image_info->signature == MagickCoreSignature); - if ((image != (Image ) NULL) && (image->debug != MagickFalse)) + if ((image != (Image ) NULL) && (IsEventLogging() != MagickFalse)) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); else - if ((image_info != (ImageInfo ) NULL) && (image_info->debug != MagickFalse)) + if ((image_info != (ImageInfo ) NULL) && (IsEventLogging() != MagickFalse)) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s","no-image"); if (embed_text == (const char ) NULL) return(ConstantString("")); @@ -1130,9 +1129,8 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - delegate_info=GetDelegateInfo(decode,encode,exception); if (delegate_info == (const DelegateInfo ) NULL) { @@ -1186,8 +1184,8 @@ / MagickExport const char GetDelegateCommands(const DelegateInfo delegate_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); - + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(delegate_info != (DelegateInfo ) NULL); assert(delegate_info->signature == MagickCoreSignature); return(delegate_info->commands); @@ -1355,8 +1353,8 @@ / assert(number_delegates != (size_t ) NULL); assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); - + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_delegates=0; p=GetDelegateInfo("","",exception); if (p == (const DelegateInfo ) NULL) @@ -1451,8 +1449,8 @@ Allocate delegate list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); - + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_delegates != (size_t ) NULL); number_delegates=0; p=GetDelegateInfo("","",exception); @@ -1506,8 +1504,8 @@ / MagickExport ssize_t GetDelegateMode(const DelegateInfo delegate_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); - + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(delegate_info != (DelegateInfo ) NULL); assert(delegate_info->signature == MagickCoreSignature); return(delegate_info->mode); @@ -1540,10 +1538,10 @@ MagickExport MagickBooleanType GetDelegateThreadSupport( const DelegateInfo delegate_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); - assert(delegate_info != (DelegateInfo ) NULL); assert(delegate_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(delegate_info->thread_support); } @@ -1716,7 +1714,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); rights=ExecutePolicyRights; if ((decode != (const char *) NULL) &&
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/deprecate.c ^
@@ -202,7 +202,7 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(geometry != (const RectangleInfo ) NULL); assert(exception != (ExceptionInfo ) NULL);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/display.c ^
@@ -1646,7 +1646,7 @@ assert(image_info->signature == MagickCoreSignature); assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); display=XOpenDisplay(image_info->server_name); if (display == (Display ) NULL) @@ -1725,7 +1725,8 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); assert(filename != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); display=XOpenDisplay(image_info->server_name); if (display == (Display ) NULL) { @@ -4094,7 +4095,7 @@ { case ButtonPress: { - if (image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Press: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -4114,7 +4115,7 @@ } case ButtonRelease: { - if (image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Release: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -4154,7 +4155,7 @@ length=XLookupString((XKeyEvent ) &event.xkey,command,(int) sizeof(command),&key_symbol,(XComposeStatus ) NULL); (command+length)='\0'; - if (image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Key press: 0x%lx (%s)",(unsigned long) key_symbol,command); switch ((int) key_symbol) @@ -4213,7 +4214,7 @@ } default: { - if (image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(),"Event type: %d", event.type); break; @@ -4392,7 +4393,7 @@ / width=(unsigned int) windows->image.window_changes.width; height=(unsigned int) windows->image.window_changes.height; - if (image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Configure Image: %dx%d=>%.20gx%.20g",windows->image.ximage->width, windows->image.ximage->height,(double) width,(double) height); @@ -8934,8 +8935,11 @@ / unique_file=AcquireUniqueFileResource(image_info->filename); if (unique_file == -1) - XNoticeWidget(display,windows,"Unable to edit image comment", - image_info->filename); + { + XNoticeWidget(display,windows,"Unable to edit image comment", + image_info->filename); + break; + } value=GetImageProperty(image,"comment",exception); if (value == (char ) NULL) unique_file=close(unique_file)-1; @@ -10730,7 +10734,7 @@ { case ButtonPress: { - if (image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Press: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -10759,7 +10763,7 @@ } case ButtonRelease: { - if (image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Button Release: 0x%lx %u +%d+%d",event.xbutton.window, event.xbutton.button,event.xbutton.x,event.xbutton.y); @@ -10799,7 +10803,7 @@ length=XLookupString((XKeyEvent ) &event.xkey,command,(int) sizeof(command),&key_symbol,(XComposeStatus ) NULL); (command+length)='\0'; - if (image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Key press: 0x%lx (%s)",(long) key_symbol,command); switch ((int) key_symbol) @@ -10858,7 +10862,7 @@ } default: { - if (image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(),"Event type: %d", event.type); break; @@ -13835,7 +13839,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); resources=(resource_info); window_info.id=(Window) NULL; @@ -13950,7 +13954,7 @@ image->filename); window_info.x=0; window_info.y=0; - if (image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) { (void) LogMagickEvent(X11Event,GetMagickModule(), "Image: %s[%.20g] %.20gx%.20g ",image->filename,(double) image->scene, @@ -14528,7 +14532,7 @@ assert(image != (Image *) NULL); assert((image)->signature == MagickCoreSignature); - if ((image)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(image)->filename); display_image=(image); warning_handler=(WarningHandler) NULL; @@ -14601,7 +14605,7 @@ manager_hints=windows->manager_hints; root_window=XRootWindow(display,visual_info->screen); nexus=NewImageList(); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) { (void) LogMagickEvent(X11Event,GetMagickModule(), "Image: %s[%.20g] %.20gx%.20g ",display_image->filename, @@ -14631,7 +14635,7 @@ manager_hints->initial_state=WithdrawnState; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->context); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (context)",windows->context.id); context_values.background=pixel->background_color.pixel; @@ -14682,7 +14686,7 @@ manager_hints->initial_state=IconicState; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->icon); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (icon)", windows->icon.id); / @@ -14785,7 +14789,7 @@ NormalState; XMakeWindow(display,root_window,argv,argc,class_hints,manager_hints, &windows->backdrop); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (backdrop)",windows->backdrop.id); (void) XMapWindow(display,windows->backdrop.id); @@ -14817,7 +14821,7 @@ manager_hints->flags\|=WindowGroupHint; manager_hints->window_group=windows->group_leader.id; (void) XSelectInput(display,windows->group_leader.id,StructureNotifyMask); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Window id: 0x%lx (group leader)",windows->group_leader.id); } @@ -14829,7 +14833,7 @@ if (windows->group_leader.id != (Window) NULL) (void) XSetTransientForHint(display,windows->image.id, windows->group_leader.id); - if (display_image->debug != MagickFalse) + if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(),"Window id: 0x%lx (image)", windows->image.id); /* @@ -14859,7 +14863,7 @@ (void) XSetTransientForHint(display,windows->info.id,windows->image.id); if (windows->image.mapped != MagickFalse) (void) XWithdrawWindow(display,windows->info.id,windows->info.screen); - if (display_image->debug != MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/distort.c ^
@@ -293,11 +293,11 @@ Affine transform image. / assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(affine_matrix != (AffineMatrix ) NULL); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); distort[0]=affine_matrix->sx; distort[1]=affine_matrix->rx; distort[2]=affine_matrix->ry; @@ -1564,10 +1564,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((columns == 0) \|\| (rows == 0)) return((Image ) NULL); / Do not short-circuit this resize if final image size is unchanged / @@ -1775,11 +1775,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); - + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); / Handle Special Compound Distortions / @@ -2967,7 +2966,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); @@ -3051,10 +3050,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); /* Determine number of color values needed per control point */ number_colors=0;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/distribute-cache.c ^
@@ -22,7 +22,7 @@ % January 2013 % % % % % -% Copyright @ 2013 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -351,7 +351,8 @@ { server_info->session_key=session_key; (void) CopyMagickString(server_info->hostname,hostname,MagickPathExtent); - server_info->debug=IsEventLogging(); + server_info->debug=(GetLogEventMask() & CacheEvent) != 0 ? MagickTrue : + MagickFalse; } hostname=DestroyString(hostname); return(server_info); @@ -764,7 +765,7 @@ exception; MagickBooleanType - status; + status = MagickFalse; MagickOffsetType count; @@ -811,7 +812,7 @@ client_socket=((SOCKET_TYPE ) socket); count=dpc_send(client_socket,DPCSessionKeyLength,GetStringInfoDatum(secret)); secret=DestroyStringInfo(secret); - for ( ; ; ) + for (status=MagickFalse; ; ) { count=dpc_read(client_socket,1,(unsigned char ) &command); if (count <= 0) @@ -819,7 +820,6 @@ count=dpc_read(client_socket,sizeof(key),(unsigned char *) &key); if ((count != (MagickOffsetType) sizeof(key)) \|\| (key != session_key)) break; - status=MagickFalse; switch (command) { case 'o':
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/draw.c ^
@@ -378,7 +378,7 @@ clone_info->composite_mask=CloneImage(draw_info->composite_mask,0,0, MagickTrue,exception); clone_info->render=draw_info->render; - clone_info->debug=IsEventLogging(); + clone_info->debug=draw_info->debug; exception=DestroyExceptionInfo(exception); return(clone_info); } @@ -780,7 +780,7 @@ } qsort(polygon_info->edges,(size_t) polygon_info->number_edges, sizeof(polygon_info->edges),DrawCompareEdges); - if (IsEventLogging() != MagickFalse) + if ((GetLogEventMask() & DrawEvent) != 0) LogPolygonInfo(polygon_info); return(polygon_info); } @@ -965,9 +965,9 @@ MagickExport DrawInfo DestroyDrawInfo(DrawInfo draw_info) { assert(draw_info != (DrawInfo ) NULL); - if (draw_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(draw_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (draw_info->id != (char ) NULL) draw_info->id=DestroyString(draw_info->id); if (draw_info->primitive != (char ) NULL) @@ -1185,7 +1185,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(source != (const Image ) NULL); assert(source->signature == MagickCoreSignature); @@ -1573,9 +1573,9 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(draw_info != (const DrawInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); clip_mask=AcquireImage((const ImageInfo ) NULL,exception); status=SetImageExtent(clip_mask,image->columns,image->rows,exception); if (status == MagickFalse) @@ -1586,7 +1586,7 @@ clip_mask->background_color.alpha=(MagickRealType) TransparentAlpha; clip_mask->background_color.alpha_trait=BlendPixelTrait; status=SetImageBackgroundColor(clip_mask,exception); - if (image->debug != MagickFalse) + if (draw_info->debug != MagickFalse) (void) LogMagickEvent(DrawEvent,GetMagickModule(),"\nbegin clip-path %s", id); clone_info=CloneDrawInfo((ImageInfo ) NULL,draw_info); @@ -1613,7 +1613,7 @@ } if (status == MagickFalse) clip_mask=DestroyImage(clip_mask); - if (image->debug != MagickFalse) + if (draw_info->debug != MagickFalse) (void) LogMagickEvent(DrawEvent,GetMagickModule(),"end clip-path"); return(clip_mask); } @@ -1667,9 +1667,9 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(draw_info != (const DrawInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); composite_mask=AcquireImage((const ImageInfo ) NULL,exception); status=SetImageExtent(composite_mask,image->columns,image->rows,exception); if (status == MagickFalse) @@ -1681,7 +1681,7 @@ composite_mask->background_color.alpha=(MagickRealType) TransparentAlpha; composite_mask->background_color.alpha_trait=BlendPixelTrait; (void) SetImageBackgroundColor(composite_mask,exception); - if (image->debug != MagickFalse) + if (draw_info->debug != MagickFalse) (void) LogMagickEvent(DrawEvent,GetMagickModule(),"\nbegin mask-path %s", id); clone_info=CloneDrawInfo((ImageInfo ) NULL,draw_info); @@ -1705,7 +1705,7 @@ } if (status == MagickFalse) composite_mask=DestroyImage(composite_mask); - if (image->debug != MagickFalse) + if (draw_info->debug != MagickFalse) (void) LogMagickEvent(DrawEvent,GetMagickModule(),"end mask-path"); return(composite_mask); } @@ -1775,7 +1775,7 @@ n; assert(draw_info != (const DrawInfo ) NULL); - if (image->debug != MagickFalse) + if (draw_info->debug != MagickFalse) (void) LogMagickEvent(DrawEvent,GetMagickModule()," begin draw-dash"); for (i=0; primitive_info[i].primitive != UndefinedPrimitive; i++) ; number_vertices=(size_t) i; @@ -1892,7 +1892,7 @@ } dash_polygon=(PrimitiveInfo ) RelinquishMagickMemory(dash_polygon); clone_info=DestroyDrawInfo(clone_info); - if (image->debug != MagickFalse) + if (draw_info->debug != MagickFalse) (void) LogMagickEvent(DrawEvent,GetMagickModule()," end draw-dash"); return(status != 0 ? MagickTrue : MagickFalse); } @@ -2031,9 +2031,9 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(draw_info != (const DrawInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); gradient=(&draw_info->gradient); qsort(gradient->stops,gradient->number_stops,sizeof(StopInfo), StopInfoCompare); @@ -2536,19 +2536,17 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(draw_info != (DrawInfo ) NULL); assert(draw_info->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (depth > MagickMaxRecursionDepth) ThrowBinaryException(DrawError,"VectorGraphicsNestedTooDeeply", image->filename); if ((draw_info->primitive == (char ) NULL) \|\| (draw_info->primitive == '\0')) return(MagickFalse); - if (image->debug != MagickFalse) + if (draw_info->debug != MagickFalse) (void) LogMagickEvent(DrawEvent,GetMagickModule(),"begin draw-image"); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); @@ -2969,7 +2967,8 @@ graphic_context[n]->fill.alpha=graphic_context[n]->fill_alpha; else graphic_context[n]->fill.alpha=(MagickRealType) - ClampToQuantum(QuantumRange(1.0-opacity)); + ClampToQuantum(QuantumRangeopacity); + graphic_context[n]->fill.alpha_trait=BlendPixelTrait; break; } if (LocaleCompare("fill-rule",keyword) == 0) @@ -3794,7 +3793,8 @@ graphic_context[n]->stroke.alpha=graphic_context[n]->stroke_alpha; else graphic_context[n]->stroke.alpha=(MagickRealType) - ClampToQuantum(QuantumRange(1.0-opacity)); + ClampToQuantum(QuantumRangeopacity); + graphic_context[n]->stroke.alpha_trait=BlendPixelTrait; break; } if (LocaleCompare("stroke-width",keyword) == 0) @@ -3997,7 +3997,7 @@ if (number_stops > 0) stops=(StopInfo ) RelinquishMagickMemory(stops); } - if ((image->debug != MagickFalse) && (q > p)) + if ((draw_info->debug != MagickFalse) && (q > p)) (void) LogMagickEvent(DrawEvent,GetMagickModule()," %.s",(int) (q-p-1),p); continue; @@ -4396,7 +4396,7 @@ if (status == 0) break; primitive_info[i].primitive=UndefinedPrimitive; - if ((image->debug != MagickFalse) && (q > p)) + if ((draw_info->debug != MagickFalse) && (q > p)) (void) LogMagickEvent(DrawEvent,GetMagickModule()," %.s",(int) (q-p),p); / Sanity check. @@ -4463,7 +4463,7 @@ if (status == 0) break; } - if (image->debug != MagickFalse) + if (draw_info->debug != MagickFalse) (void) LogMagickEvent(DrawEvent,GetMagickModule(),"end draw-image"); /* Relinquish resources. @@ -4551,10 +4551,10 @@
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/effect.c ^
@@ -160,10 +160,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); blur_image=CloneImage(image,0,0,MagickTrue,exception); if (blur_image == (Image ) NULL) return((Image ) NULL); @@ -481,10 +481,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); sharp_image=CloneImage(image,0,0,MagickTrue,exception); if (sharp_image == (Image ) NULL) return((Image ) NULL); @@ -780,10 +780,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); #if defined(MAGICKCORE_OPENCL_SUPPORT) blur_image=AccelerateBlurImage(image,radius,sigma,exception); if (blur_image != (Image ) NULL) @@ -930,10 +930,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); blur_image=CloneImage(image,0,0,MagickTrue,exception); if (blur_image == (Image ) NULL) return((Image ) NULL); @@ -1233,10 +1233,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(f != (Quantum ) NULL); assert(g != (Quantum ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); p=f+(columns+2); q=g+(columns+2); r=p+(y_offset((ssize_t) columns+2)+x_offset); @@ -1351,10 +1351,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); #if defined(MAGICKCORE_OPENCL_SUPPORT) despeckle_image=AccelerateDespeckleImage(image,exception); if (despeckle_image != (Image ) NULL) @@ -1543,10 +1543,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); width=GetOptimalKernelWidth1D(radius,0.5); kernel_info=AcquireKernelInfo((const char ) NULL,exception); if (kernel_info == (KernelInfo ) NULL) @@ -1633,10 +1633,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); width=GetOptimalKernelWidth1D(radius,sigma); kernel_info=AcquireKernelInfo((const char ) NULL,exception); if (kernel_info == (KernelInfo ) NULL) @@ -1729,10 +1729,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) FormatLocaleString(geometry,MagickPathExtent,"gaussian:%.20gx%.20g", radius,sigma); kernel_info=AcquireKernelInfo(geometry,exception); @@ -1811,10 +1811,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); width=(size_t) radius+1; gaussian_image=BlurImage(image,radius,sigma,exception); if (gaussian_image == (Image ) NULL) @@ -2052,10 +2052,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); #if defined(MAGICKCORE_OPENCL_SUPPORT) contrast_image=AccelerateLocalContrastImage(image,radius,strength,exception); if (contrast_image != (Image ) NULL) @@ -2333,7 +2333,8 @@ / Generate a 1-D convolution kernel. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); kernel=(MagickRealType ) MagickAssumeAligned(AcquireAlignedMemory((size_t) width,sizeof(kernel))); if (kernel == (MagickRealType ) NULL) @@ -2387,9 +2388,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); + assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); width=GetOptimalKernelWidth1D(radius,sigma); kernel=GetMotionBlurKernel(width,sigma); if (kernel == (MagickRealType ) NULL) @@ -2656,7 +2658,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); colors=2; degrees=0.0; @@ -3176,10 +3178,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); #if defined(MAGICKCORE_OPENCL_SUPPORT) blur_image=AccelerateRotationalBlurImage(image,angle,exception); if (blur_image != (Image ) NULL) @@ -3449,10 +3451,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); width=GetOptimalKernelWidth1D(radius,sigma); kernel=(MagickRealType *) MagickAssumeAligned(AcquireAlignedMemory((size_t)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/enhance.c ^
@@ -238,7 +238,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); alpha=contrast; slope=tan((double) (MagickPI(alpha/100.0+1.0)/4.0)); @@ -657,7 +657,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); range_info.min=0; range_info.max=NumberCLAHEGrays-1; @@ -856,10 +856,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(clut_image != (Image ) NULL); assert(clut_image->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); if ((IsGrayColorspace(image->colorspace) != MagickFalse) && @@ -1072,7 +1072,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (color_correction_collection == (const char ) NULL) return(MagickFalse); @@ -1425,7 +1425,7 @@ if (AccelerateContrastImage(image,sharpen,exception) != MagickFalse) return(MagickTrue); #endif - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); sign=sharpen != MagickFalse ? 1 : -1; if (image->storage_class == PseudoClass) @@ -1583,7 +1583,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); type=IdentifyImageType(image,exception); if (IsGrayImageType(type) != MagickFalse) @@ -1886,7 +1886,7 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); @@ -2039,11 +2039,11 @@ image_view; double - black[CompositePixelChannel+1], + black[2CompositePixelChannel+1], equalize_map, histogram, map, - white[CompositePixelChannel+1]; + white[2CompositePixelChannel+1]; MagickBooleanType status; @@ -2066,7 +2066,7 @@ if (AccelerateEqualizeImage(image,exception) != MagickFalse) return(MagickTrue); #endif - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); equalize_map=(double ) AcquireQuantumMemory(MaxMap+1UL,MaxPixelChannels* sizeof(equalize_map)); @@ -2340,7 +2340,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (gamma == 1.0) return(MagickTrue); @@ -2483,7 +2483,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) { @@ -2715,7 +2715,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(hald_image != (Image ) NULL); assert(hald_image->signature == MagickCoreSignature); @@ -2931,7 +2931,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) for (i=0; i < (ssize_t) image->colors; i++) @@ -3085,7 +3085,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) for (i=0; i < (ssize_t) image->colors; i++) @@ -3221,7 +3221,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((IsGrayColorspace(image->colorspace) != MagickFalse) && ((IsGrayColorspace(black_color->colorspace) == MagickFalse) \|\| @@ -3667,7 +3667,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (modulate == (char ) NULL) return(MagickFalse); @@ -3682,19 +3682,18 @@ percent_hue=geometry_info.xi; artifact=GetImageArtifact(image,"modulate:colorspace"); if (artifact != (const char ) NULL) - { - colorspace=(ColorspaceType) ParseCommandOption(MagickColorspaceOptions, - MagickFalse,artifact); - if ((ssize_t) illuminant < 0) - colorspace=UndefinedColorspace; - } + colorspace=(ColorspaceType) ParseCommandOption(MagickColorspaceOptions, + MagickFalse,artifact); artifact=GetImageArtifact(image,"color:illuminant"); if (artifact != (const char ) NULL) { illuminant=(IlluminantType) ParseCommandOption(MagickIlluminantOptions, MagickFalse,artifact); if ((ssize_t) illuminant < 0) - illuminant=UndefinedIlluminant; + { + illuminant=UndefinedIlluminant; + colorspace=UndefinedColorspace; + } } if (image->storage_class == PseudoClass) for (i=0; i < (ssize_t) image->colors; i++) @@ -3942,7 +3941,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) for (i=0; i < (ssize_t) image->colors; i++) @@ -4274,7 +4273,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); /* Side effect: may clamp values unless contrast<MagickEpsilon, in which @@ -4443,7 +4442,7 @@ / assert(image != (Image ) NULL);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/feature.c ^
@@ -275,10 +275,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); /* Filter out noise. / @@ -671,7 +671,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((image->columns < (distance+1)) \|\| (image->rows < (distance+1))) return((ChannelFeatures ) NULL); @@ -1887,10 +1887,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); accumulator_width=180; hough_height=((sqrt(2.0)(double) (image->rows > image->columns ? image->rows : image->columns))/2.0); @@ -2187,10 +2187,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); mean_image=CloneImage(image,0,0,MagickTrue,exception); if (mean_image == (Image ) NULL) return((Image *) NULL);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/fourier.c ^
@@ -173,10 +173,10 @@ assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); if (images->next == (Image ) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, @@ -540,10 +540,10 @@ / Create "Fourier Transform" image from constituent arrays. / - magnitude_info=AcquireVirtualMemory((size_t) fourier_info->width, - fourier_info->heightsizeof(magnitude_pixels)); - phase_info=AcquireVirtualMemory((size_t) fourier_info->width, - fourier_info->heightsizeof(phase_pixels)); + magnitude_info=AcquireVirtualMemory(fourier_info->width,fourier_info->height + sizeof(magnitude_pixels)); + phase_info=AcquireVirtualMemory(fourier_info->width,fourier_info->height + sizeof(phase_pixels)); if ((magnitude_info == (MemoryInfo ) NULL) \|\| (phase_info == (MemoryInfo ) NULL)) { @@ -723,8 +723,14 @@ / Generate the forward Fourier transform. / - source_info=AcquireVirtualMemory((size_t) fourier_info->width, - fourier_info->heightsizeof(source_pixels)); + if ((fourier_info->width >= INT_MAX) \|\| (fourier_info->height >= INT_MAX)) + { + (void) ThrowMagickException(exception,GetMagickModule(),ImageError, + "WidthOrHeightExceedsLimit","`%s'",image->filename); + return(MagickFalse); + } + source_info=AcquireVirtualMemory(fourier_info->width,fourier_info->height + sizeof(source_pixels)); if (source_info == (MemoryInfo ) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), @@ -778,8 +784,8 @@ } } image_view=DestroyCacheView(image_view); - forward_info=AcquireVirtualMemory((size_t) fourier_info->width, - (fourier_info->height/2+1)sizeof(forward_pixels)); + forward_info=AcquireVirtualMemory(fourier_info->width,(fourier_info->height/2+ + 1)sizeof(forward_pixels)); if (forward_info == (MemoryInfo ) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), @@ -791,8 +797,8 @@ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ForwardFourierTransform) #endif - fftw_r2c_plan=fftw_plan_dft_r2c_2d(fourier_info->width,fourier_info->height, - source_pixels,forward_pixels,FFTW_ESTIMATE); + fftw_r2c_plan=fftw_plan_dft_r2c_2d((int) fourier_info->width, + (int) fourier_info->height,source_pixels,forward_pixels,FFTW_ESTIMATE); fftw_execute_dft_r2c(fftw_r2c_plan,source_pixels,forward_pixels); fftw_destroy_plan(fftw_r2c_plan); source_info=(MemoryInfo ) RelinquishVirtualMemory(source_info); @@ -874,10 +880,10 @@ fourier_info.center=(ssize_t) (fourier_info.width/2L)+1L; fourier_info.channel=channel; fourier_info.modulus=modulus; - magnitude_info=AcquireVirtualMemory((size_t) fourier_info.width, - (fourier_info.height/2+1)sizeof(magnitude_pixels)); - phase_info=AcquireVirtualMemory((size_t) fourier_info.width, - (fourier_info.height/2+1)sizeof(phase_pixels)); + magnitude_info=AcquireVirtualMemory(fourier_info.width,(fourier_info.height/2+ + 1)sizeof(magnitude_pixels)); + phase_info=AcquireVirtualMemory(fourier_info.width,(fourier_info.height/2+1)* + sizeof(phase_pixels)); if ((magnitude_info == (MemoryInfo ) NULL) \|\| (phase_info == (MemoryInfo ) NULL)) { @@ -1136,12 +1142,12 @@ / Inverse fourier - read image and break down into a double array. / - magnitude_info=AcquireVirtualMemory((size_t) fourier_info->width, - fourier_info->heightsizeof(magnitude_pixels)); - phase_info=AcquireVirtualMemory((size_t) fourier_info->width, - fourier_info->heightsizeof(phase_pixels)); - inverse_info=AcquireVirtualMemory((size_t) fourier_info->width, - (fourier_info->height/2+1)sizeof(inverse_pixels)); + magnitude_info=AcquireVirtualMemory(fourier_info->width,fourier_info->height + sizeof(magnitude_pixels)); + phase_info=AcquireVirtualMemory(fourier_info->width,fourier_info->height + sizeof(phase_pixels)); + inverse_info=AcquireVirtualMemory(fourier_info->width,(fourier_info->height/2+ + 1)sizeof(inverse_pixels)); if ((magnitude_info == (MemoryInfo ) NULL) \|\| (phase_info == (MemoryInfo ) NULL) \|\| (inverse_info == (MemoryInfo ) NULL)) @@ -1332,8 +1338,17 @@ ssize_t y; - source_info=AcquireVirtualMemory((size_t) fourier_info->width, - fourier_info->heightsizeof(source_pixels)); + /* + Generate the inverse Fourier transform. + / + if ((fourier_info->width >= INT_MAX) \|\| (fourier_info->height >= INT_MAX)) + { + (void) ThrowMagickException(exception,GetMagickModule(),ImageError, + "WidthOrHeightExceedsLimit","`%s'",image->filename); + return(MagickFalse); + } + source_info=AcquireVirtualMemory(fourier_info->width,fourier_info->height + sizeof(source_pixels)); if (source_info == (MemoryInfo ) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), @@ -1368,8 +1383,8 @@ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_InverseFourierTransform) #endif - fftw_c2r_plan=fftw_plan_dft_c2r_2d(fourier_info->width,fourier_info->height, - fourier_pixels,source_pixels,FFTW_ESTIMATE); + fftw_c2r_plan=fftw_plan_dft_c2r_2d((int) fourier_info->width, + (int) fourier_info->height,fourier_pixels,source_pixels,FFTW_ESTIMATE); fftw_execute_dft_c2r(fftw_c2r_plan,fourier_pixels,source_pixels); fftw_destroy_plan(fftw_c2r_plan); i=0L; @@ -1460,8 +1475,8 @@ fourier_info.center=(ssize_t) (fourier_info.width/2L)+1L; fourier_info.channel=channel; fourier_info.modulus=modulus; - inverse_info=AcquireVirtualMemory((size_t) fourier_info.width, - (fourier_info.height/2+1)sizeof(inverse_pixels)); + inverse_info=AcquireVirtualMemory(fourier_info.width,(fourier_info.height/2+ + 1)sizeof(inverse_pixels)); if (inverse_info == (MemoryInfo ) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), @@ -1489,7 +1504,7 @@ assert(magnitude_image != (Image ) NULL); assert(magnitude_image->signature == MagickCoreSignature); - if (magnitude_image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", magnitude_image->filename); if (phase_image == (Image *) NULL)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/fx.c ^
@@ -78,6 +78,7 @@ #include "MagickCore/option.h" #include "MagickCore/pixel.h" #include "MagickCore/pixel-accessor.h" +#include "MagickCore/policy.h" #include "MagickCore/property.h" #include "MagickCore/quantum.h" #include "MagickCore/quantum-private.h" @@ -336,7 +337,7 @@ {fAtan2, "atan2" , 2}, {fAtan, "atan" , 1}, {fCeil, "ceil" , 1}, - {fChannel, "channel" , 5}, + {fChannel, "channel", 5}, /* Special case: allow zero to five arguments. / {fClamp, "clamp" , 1}, {fCosh, "cosh" , 1}, {fCos, "cos" , 1}, @@ -461,7 +462,9 @@ {aT, "t", 0}, {aW, "w", 0}, {aZ, "z", 0}, - + {aNull, "anull", 0}, + {aNull, "anull", 0}, + {aNull, "anull", 0}, {aNull, "anull", 0} }; @@ -727,7 +730,7 @@ (void) ThrowMagickException ( pfx->exception, GetMagickModule(), ResourceLimitFatalError, "Imgs", "%lu", - pfx->ImgListLen); + (unsigned long) pfx->ImgListLen); return MagickFalse; } @@ -740,7 +743,7 @@ (void) ThrowMagickException ( pfx->exception, GetMagickModule(), ResourceLimitFatalError, "View", "[%li]", - i); + (long) i); / dealloc any done so far, and Imgs / for ( ; i > 0; i--) { pimg = &pfx->Imgs[i-1]; @@ -1605,7 +1608,7 @@ (void) ThrowMagickException ( pfx->exception, GetMagickModule(), OptionError, "lenfun too long", "'%lu' at '%s'", - lenfun, SetShortExp(pfx)); + (unsigned long) lenfun, SetShortExp(pfx)); dummy_exception = DestroyExceptionInfo (dummy_exception); return -1; } @@ -1787,6 +1790,13 @@ } switch (FndArgs) { case 1: + if (ndx1 != NULL_ADDRESS) { + (void) ThrowMagickException ( + pfx->exception, GetMagickModule(), OptionError, + "For function", "'%s' required argument is missing at '%s'", + funStr, SetShortExp(pfx)); + return MagickFalse; + } ndx1 = pfx->usedElements; if (fe==fWhile) { (void) AddAddressingElement (pfx, rIfZeroGoto, NULL_ADDRESS); / address will be ndx2+1 / @@ -1800,6 +1810,13 @@ } break; case 2: + if (ndx2 != NULL_ADDRESS) { + (void) ThrowMagickException ( + pfx->exception, GetMagickModule(), OptionError, + "For function", "'%s' required argument is missing at '%s'", + funStr, SetShortExp(pfx)); + return MagickFalse; + } ndx2 = pfx->usedElements; if (fe==fWhile) { pfx->Elements[pfx->usedElements-1].DoPush = MagickFalse; @@ -1816,6 +1833,13 @@ } break; case 3: + if (ndx3 != NULL_ADDRESS) { + (void) ThrowMagickException ( + pfx->exception, GetMagickModule(), OptionError, + "For function", "'%s' required argument is missing at '%s'", + funStr, SetShortExp(pfx)); + return MagickFalse; + } if (fe==fFor) { pfx->Elements[pfx->usedElements-1].DoPush = MagickFalse; (void) AddAddressingElement (pfx, rGoto, ndx1); @@ -1838,18 +1862,26 @@ return MagickFalse; } - if (fe == fP \|\| fe == fS \|\| fe == fU) { + if (fe == fP \|\| fe == fS \|\| fe == fU \|\| fe == fChannel) { while (FndArgs < Functions[fe-FirstFunc].nArgs) { (void) AddElement (pfx, (fxFltType) 0, oNull); FndArgs++; } } - if (FndArgs > Functions[fe-FirstFunc].nArgs) { - (void) ThrowMagickException ( - pfx->exception, GetMagickModule(), OptionError, - "For function", "'%s' expected %i arguments, found '%i' at '%s'", - funStr, Functions[fe-FirstFunc].nArgs, FndArgs, SetShortExp(pfx)); + if (FndArgs > Functions[fe-FirstFunc].nArgs) + { + if (fe==fChannel) { + (void) ThrowMagickException ( + pfx->exception, GetMagickModule(), OptionError, + "For function", "'%s' expected up to %i arguments, found '%i' at '%s'", + funStr, Functions[fe-FirstFunc].nArgs, FndArgs, SetShortExp(pfx)); + } else { + (void) ThrowMagickException ( + pfx->exception, GetMagickModule(), OptionError, + "For function", "'%s' expected %i arguments, found '%i' at '%s'", + funStr, Functions[fe-FirstFunc].nArgs, FndArgs, SetShortExp(pfx)); + } return MagickFalse; } if (FndArgs < Functions[fe-FirstFunc].nArgs) { @@ -2670,6 +2702,8 @@ } } + if (ternary.addrQuery != NULL_ADDRESS) needPopAll = MagickTrue; + (void) ResolveTernaryAddresses (pfx, &ternary); pfx->teDepth--; @@ -2747,6 +2781,9 @@ ChannelStatistics * cs = GetImageStatistics (img, pfx->exception); /* Use RelinquishMagickMemory() somewhere. / + if (cs == (ChannelStatistics ) NULL) + return((ChannelStatistics ) NULL); + for (ch=0; ch <= (int) MaxPixelChannels; ch++) { cs[ch].mean = QuantumScale; cs[ch].median = QuantumScale; @@ -2772,7 +2809,7 @@ (void) ThrowMagickException ( pfx->exception, GetMagickModule(), ResourceLimitFatalError, "Statistics", "%lu", - pfx->ImgListLen); + (unsigned long) pfx->ImgListLen); return MagickFalse; } @@ -2840,19 +2877,24 @@ ret = (fxFltType) GetBlobSize (pfx->image); break; case aKurtosis: - ret = cs[channel].kurtosis; + if (cs != (ChannelStatistics ) NULL) + ret = cs[channel].kurtosis; break; case aMaxima: - ret = cs[channel].maxima; + if (cs != (ChannelStatistics ) NULL) + ret = cs[channel].maxima; break; case aMean: - ret = cs[channel].mean; + if (cs != (ChannelStatistics ) NULL) + ret = cs[channel].mean; break; case aMedian: - ret = cs[channel].median; + if (cs != (ChannelStatistics ) NULL) + ret = cs[channel].median; break; case aMinima: - ret = cs[channel].minima; + if (cs != (ChannelStatistics ) NULL) + ret = cs[channel].minima; break; case aPage: /* Do nothing / @@ -2893,10 +2935,12 @@ ret = pfx->Images[ImgNum]->resolution.y; break; case aSkewness: - ret = cs[channel].skewness; + if (cs != (ChannelStatistics ) NULL) + ret = cs[channel].skewness; break; case aStdDev: - ret = cs[channel].standard_deviation; + if (cs != (ChannelStatistics *) NULL) + ret = cs[channel].standard_deviation;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/gem.c ^
@@ -1650,16 +1650,15 @@ normalize, value; - ssize_t - i; - size_t width; ssize_t + i, j; - - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (radius > MagickEpsilon) return((size_t) (2.0ceil(radius)+1.0)); gamma=fabs(sigma); @@ -1699,7 +1698,8 @@ u, v; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (radius > MagickEpsilon) return((size_t) (2.0ceil(radius)+1.0)); gamma=fabs(sigma);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/geometry.c ^
@@ -474,7 +474,8 @@ i; assert(page_geometry != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",page_geometry); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",page_geometry); (void) CopyMagickString(page,page_geometry,MagickPathExtent); for (i=0; i < (ssize_t) (sizeof(PageSizes)/sizeof(PageSizes[0])); i++) { @@ -964,6 +965,8 @@ { if ((p+1) == ')') return(flags); + (void) CopyMagickString(p,p+1,MagickPathExtent); + break; } case ')': { @@ -1262,7 +1265,8 @@ height, width; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",geometry); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",geometry); if ((geometry == (char ) NULL) \|\| (geometry == '\0')) return(NoValue); SetGeometry(image,region_info); @@ -1431,7 +1435,8 @@ assert(y != (ssize_t ) NULL); assert(width != (size_t ) NULL); assert(height != (size_t ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",geometry); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",geometry); if ((geometry == (char ) NULL) \|\| (geometry == '\0')) return(NoValue); / @@ -1730,7 +1735,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(geometry != (RectangleInfo ) NULL); (void) memset(geometry,0,sizeof(geometry)); @@ -1763,6 +1768,7 @@ MagickExport void SetGeometryInfo(GeometryInfo geometry_info) { assert(geometry_info != (GeometryInfo ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); (void) memset(geometry_info,0,sizeof(geometry_info)); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/histogram.c ^
@@ -242,7 +242,7 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); cube_info=GetCubeInfo(); if (cube_info == (CubeInfo ) NULL) @@ -579,8 +579,8 @@ root=histogram; DefineImageHistogram(image,cube_info->root,&root); } + cube_info=DestroyCubeInfo(image,cube_info); } - cube_info=DestroyCubeInfo(image,cube_info); return(histogram); } @@ -798,7 +798,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); return(CheckImageColors(image,256,exception)); } @@ -836,7 +836,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); return(CheckImageColors(image,MaximumUniqueColors,exception)); } @@ -868,7 +868,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class != PseudoClass) return(MagickFalse); @@ -1063,8 +1063,10 @@ cube_info=ClassifyImageColors(image,exception); if (cube_info != (CubeInfo *) NULL) - number_colors=cube_info->colors; - cube_info=DestroyCubeInfo(image,cube_info); + { + number_colors=cube_info->colors; + cube_info=DestroyCubeInfo(image,cube_info); + } return(number_colors); } histogram=GetImageHistogram(image,&number_colors,exception); @@ -1099,7 +1101,7 @@ (void) ConcatenateMagickString(tuple,")",MagickPathExtent); (void) QueryColorname(image,&pixel,SVGCompliance,color,exception); GetColorTuple(&pixel,MagickTrue,hex); - (void) sprintf(count,"%.20g:",(double) ((MagickOffsetType) p->count)); + (void) sprintf(count,"%10.20g:",(double) ((MagickOffsetType) p->count)); (void) FormatLocaleFile(file," %s %s %s %s\n",count,tuple,hex,color); if (image->progress_monitor != (MagickProgressMonitor) NULL) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/identify.c ^
@@ -77,6 +77,7 @@ #include "MagickCore/montage.h" #include "MagickCore/option.h" #include "MagickCore/pixel-accessor.h" +#include "MagickCore/pixel-private.h" #include "MagickCore/prepress.h" #include "MagickCore/profile.h" #include "MagickCore/property.h" @@ -142,7 +143,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); channel_statistics=(ChannelStatistics ) AcquireQuantumMemory( MaxPixelChannels+1,sizeof(channel_statistics)); @@ -529,7 +530,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (file == (FILE ) NULL) file=stdout; @@ -594,7 +595,7 @@ default: { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) - (void) PrintChannelLocations(file,image,(PixelChannel) i,"Gray", + (void) PrintChannelLocations(file,image,(PixelChannel) i,"Channel", statistic_type,max_locations,channel_statistics); break; } @@ -816,6 +817,19 @@ if (image->alpha_trait != UndefinedPixelTrait) (void) FormatLocaleFile(file," Alpha: %.20g-bit\n",(double) channel_statistics[AlphaPixelChannel].depth); + if ((image->channels & ReadMaskChannel) != 0) + (void) FormatLocaleFile(file," Read mask: %.20g-bit\n",(double) + channel_statistics[ReadMaskPixelChannel].depth); + if ((image->channels & WriteMaskChannel) != 0) + (void) FormatLocaleFile(file," Write mask: %.20g-bit\n",(double) + channel_statistics[WriteMaskPixelChannel].depth); + if ((image->channels & CompositeMaskChannel) != 0) + (void) FormatLocaleFile(file," Composite mask: %.20g-bit\n",(double) + channel_statistics[CompositeMaskPixelChannel].depth); + if (image->number_meta_channels != 0) + for (i=0; i < (ssize_t) image->number_meta_channels; i++) + (void) FormatLocaleFile(file," Meta channel[%.20g]: %.20g-bit\n", + (double) i,(double) channel_statistics[MetaPixelChannels+i].depth); scale=1.0; if (image->depth <= MAGICKCORE_QUANTUM_DEPTH) scale=(double) (QuantumRange/((size_t) QuantumRange >> ((size_t) @@ -873,7 +887,28 @@ if (image->alpha_trait != UndefinedPixelTrait) (void) PrintChannelStatistics(file,AlphaPixelChannel,"Alpha",1.0/scale, channel_statistics); - if ((colorspace != LinearGRAYColorspace) && (colorspace != GRAYColorspace)) + if ((image->channels & ReadMaskChannel) != 0) + (void) PrintChannelStatistics(file,ReadMaskPixelChannel,"Read mask", + 1.0/scale,channel_statistics); + if ((image->channels & WriteMaskChannel) != 0) + (void) PrintChannelStatistics(file,WriteMaskPixelChannel,"Write mask", + 1.0/scale,channel_statistics); + if ((image->channels & CompositeMaskChannel) != 0) + (void) PrintChannelStatistics(file,WriteMaskPixelChannel, + "Composite mask",1.0/scale,channel_statistics); + if (image->number_meta_channels != 0) + for (i=0; i < (ssize_t) image->number_meta_channels; i++) + { + char + label[MagickPathExtent]; + + (void) FormatLocaleString(label,MagickPathExtent, + "Meta channel[%.20g]",(double) i); + (void) PrintChannelStatistics(file,(const PixelChannel) + (MetaPixelChannels+i),label,1.0/scale,channel_statistics); + } + if ((colorspace != LinearGRAYColorspace) && + (colorspace != GRAYColorspace)) { (void) FormatLocaleFile(file," Image statistics:\n"); (void) PrintChannelStatistics(file,CompositePixelChannel,"Overall", @@ -1527,6 +1562,10 @@ if (strlen(buffer) > 1) buffer[strlen(buffer)-1]='\0'; (void) FormatLocaleFile(file," Number pixels: %s\n",buffer); + (void) FormatLocaleString(buffer,MagickPathExtent,"%s", + CommandOptionToMnemonic(MagickCacheOptions,(ssize_t) + GetImagePixelCacheType(image))); + (void) FormatLocaleFile(file," Pixel cache type: %s\n",buffer); if (elapsed_time > MagickEpsilon) { (void) FormatMagickSize((MagickSizeType) ((double) image->columns
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/image-view.c ^
@@ -22,7 +22,7 @@ % March 2003 % % % % % -% Copyright @ 2003 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -731,7 +731,8 @@ image_view->extent.x=0; image_view->extent.y=0; image_view->exception=AcquireExceptionInfo(); - image_view->debug=IsEventLogging(); + image_view->debug=(GetLogEventMask() & ImageEvent) != 0 ? MagickTrue : + MagickFalse; image_view->signature=MagickCoreSignature; return(image_view); } @@ -785,7 +786,8 @@ image_view->extent.x=x; image_view->extent.y=y; image_view->exception=AcquireExceptionInfo(); - image_view->debug=IsEventLogging(); + image_view->debug=(GetLogEventMask() & ImageEvent) != 0 ? MagickTrue : + MagickFalse; image_view->signature=MagickCoreSignature; return(image_view); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/image.c ^
@@ -146,7 +146,8 @@ /* Allocate image structure. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); image=(Image ) AcquireCriticalMemory(sizeof(image)); (void) memset(image,0,sizeof(image)); /* @@ -187,7 +188,8 @@ image->channel_map=AcquirePixelChannelMap(); image->blob=CloneBlobInfo((BlobInfo ) NULL); image->timestamp=GetMagickTime(); - image->debug=IsEventLogging(); + image->debug=(GetLogEventMask() & (ImageEvent \| TransformEvent \| CoderEvent)) + != 0 ? MagickTrue : MagickFalse; image->reference_count=1; image->semaphore=AcquireSemaphoreInfo(); image->signature=MagickCoreSignature; @@ -372,7 +374,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); image->next=AcquireImage(image_info,exception); if (GetNextImageInList(image) == (Image ) NULL) @@ -467,10 +469,10 @@ / assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); alpha_trait=images->alpha_trait; number_images=1; width=images->columns; @@ -640,7 +642,7 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); exception=AcquireExceptionInfo(); CatchException(exception); @@ -706,9 +708,9 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(pathname != NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); property=AcquireString(pathname); (void) FormatLocaleString(property,MagickPathExtent,"8BIM:1999,2998:%s", pathname); @@ -802,10 +804,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((image->columns == 0) \|\| (image->rows == 0)) { (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError, @@ -859,7 +861,7 @@ clone_image->blob=CloneBlobInfo((BlobInfo ) NULL); } clone_image->ping=image->ping; - clone_image->debug=IsEventLogging(); + clone_image->debug=image->debug; clone_image->semaphore=AcquireSemaphoreInfo(); if (image->colormap != (PixelInfo ) NULL) { @@ -1006,7 +1008,7 @@ MagickPathExtent); clone_info->channel=image_info->channel; (void) CloneImageOptions(clone_info,image_info); - clone_info->debug=IsEventLogging(); + clone_info->debug=image_info->debug; clone_info->signature=image_info->signature; return(clone_info); } @@ -1064,11 +1066,11 @@ y; assert(image != (Image ) NULL); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(source_image != (Image ) NULL); assert(geometry != (RectangleInfo ) NULL); assert(offset != (OffsetInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if ((offset->x < 0) \|\| (offset->y < 0) \|\| ((ssize_t) (offset->x+geometry->width) > (ssize_t) image->columns) \|\| ((ssize_t) (offset->y+geometry->height) > (ssize_t) image->rows)) @@ -1186,7 +1188,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); destroy=MagickFalse; LockSemaphoreInfo(image->semaphore); @@ -1251,7 +1253,7 @@ { assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); if (image_info->size != (char ) NULL) @@ -1313,7 +1315,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); DisassociateBlob(image); } @@ -1351,8 +1353,9 @@ / File and image dimension members. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image_info != (ImageInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); (void) memset(image_info,0,sizeof(image_info)); image_info->adjoin=MagickTrue; image_info->interlace=NoInterlace; @@ -1376,7 +1379,8 @@ (void) QueryColorCompliance(TransparentColor,AllCompliance, &image_info->transparent_color,exception); exception=DestroyExceptionInfo(exception); - image_info->debug=IsEventLogging(); + image_info->debug=(GetLogEventMask() & ImageEvent) != 0 ? MagickTrue : + MagickFalse; image_info->signature=MagickCoreSignature; } @@ -1452,9 +1456,9 @@ Get image mask. / assert(image != (Image ) NULL); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); switch (type) { case ReadPixelMask: @@ -1568,7 +1572,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); LockSemaphoreInfo(image->semaphore); reference_count=image->reference_count; @@ -1604,7 +1608,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); return(GetPixelCacheVirtualMethod(image)); } @@ -1820,7 +1824,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; image_view=AcquireVirtualCacheView(image,exception); @@ -1906,7 +1910,7 @@ p; assert(image != (Image ) NULL); - if (image->debug != MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/layer.c ^
@@ -16,7 +16,7 @@ % January 2006 % % % % % -% Copyright @ 2006 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -246,10 +246,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); next=GetFirstImageInList(image); bounds=next->page; if (bounds.width == 0) @@ -413,10 +413,10 @@ / assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); image=GetFirstImageInList(images); dispose_image=CloneImage(image,image->page.width,image->page.height, MagickTrue,exception); @@ -589,8 +589,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % CompareImagesBounds() Given two images return the smallest rectangular area -% by which the two images differ, accourding to the given 'Compare...' -% layer method. +% by which the two images differ, according to the given 'Compare...' layer +% method. % % This currently only used internally in this module, but may eventually % be used by other modules. @@ -598,14 +598,15 @@ % The format of the CompareImagesBounds method is: % % RectangleInfo CompareImagesBounds(const LayerMethod method, -% const Image image1,const Image image2,ExceptionInfo exception) +% const Image alpha_image,const Image beta_image, +% ExceptionInfo exception) % % A description of each parameter follows: % % o method: What differences to look for. Must be one of CompareAnyLayer, % CompareClearLayer, CompareOverlayLayer. % -% o image1, image2: the two images to compare. +% o alpha_image, beta_image: the two images to compare. % % o exception: return any errors or warnings in this structure. % @@ -614,131 +615,116 @@ static RectangleInfo CompareImagesBounds(const Image alpha_image, const Image beta_image,const LayerMethod method,ExceptionInfo exception) { - CacheView - alpha_view, - beta_view; - - MagickBooleanType - status; + const Quantum + p, + q; PixelInfo - zero; + alpha_pixel, + beta_pixel; RectangleInfo bounds; ssize_t + x, y; - assert(alpha_image != (Image ) NULL); - assert(alpha_image->signature == MagickCoreSignature); - assert(beta_image != (Image ) NULL); - assert(beta_image->signature == MagickCoreSignature); - if (alpha_image->debug != MagickFalse) + /* + Set bounding box of the differences between images. + / + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", alpha_image->filename); - SetGeometry(alpha_image,&bounds); - bounds.x=(ssize_t) bounds.width; - bounds.y=(ssize_t) bounds.height; - bounds.width=0; - bounds.height=0; - alpha_view=AcquireVirtualCacheView(alpha_image,exception); - beta_view=AcquireVirtualCacheView(beta_image,exception); - GetPixelInfo(alpha_image,&zero); - status=MagickTrue; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static) shared(status) \ - magick_number_threads(alpha_image,alpha_image,alpha_image->rows,1) -#endif - for (y=0; y < (ssize_t) alpha_image->rows; y++) + GetPixelInfo(alpha_image,&alpha_pixel); + GetPixelInfo(beta_image,&beta_pixel); + for (x=0; x < (ssize_t) alpha_image->columns; x++) { - const Quantum - magick_restrict p, - magick_restrict q; - - PixelInfo - alpha_pixel, - beta_pixel; - - RectangleInfo - bounding_box; - - ssize_t - x; - - if (status == MagickFalse) - continue; -#if defined(MAGICKCORE_OPENMP_SUPPORT) -# pragma omp critical (MagickCore_CompareImagesBound) -#endif - bounding_box=bounds; - p=GetCacheViewVirtualPixels(alpha_view,0,y,alpha_image->columns,1, - exception); - q=GetCacheViewVirtualPixels(beta_view,0,y,alpha_image->columns,1,exception); - if ((p == (const Quantum ) NULL) \|\| (q == (const Quantum ) NULL)) - { - status=MagickFalse; - continue; - } - alpha_pixel=zero; - beta_pixel=zero; - for (x=0; x < (ssize_t) alpha_image->columns; x++) + p=GetVirtualPixels(alpha_image,x,0,1,alpha_image->rows,exception); + q=GetVirtualPixels(beta_image,x,0,1,beta_image->rows,exception); + if ((p == (const Quantum ) NULL) \|\| (q == (Quantum *) NULL)) + break; + for (y=0; y < (ssize_t) alpha_image->rows; y++) { GetPixelInfoPixel(alpha_image,p,&alpha_pixel); GetPixelInfoPixel(beta_image,q,&beta_pixel); - if ((x < bounding_box.x) && - (ComparePixels(method,&alpha_pixel,&beta_pixel) != MagickFalse)) - bounding_box.x=x; - if ((x > (ssize_t) bounding_box.width) && - (ComparePixels(method,&alpha_pixel,&beta_pixel) != MagickFalse)) - bounding_box.width=(size_t) x; - if ((y < bounding_box.y) && - (ComparePixels(method,&alpha_pixel,&beta_pixel) != MagickFalse)) - bounding_box.y=y; - if ((y > (ssize_t) bounding_box.height) && - (ComparePixels(method,&alpha_pixel,&beta_pixel) != MagickFalse)) - bounding_box.height=(size_t) y; - if ((x < (ssize_t) bounding_box.width) && - (y > (ssize_t) bounding_box.height) && - (ComparePixels(method,&alpha_pixel,&beta_pixel) != MagickFalse)) - { - bounding_box.width=(size_t) x; - bounding_box.height=(size_t) y; - } + if (ComparePixels(method,&alpha_pixel,&beta_pixel) != MagickFalse) + break; p+=GetPixelChannels(alpha_image); q+=GetPixelChannels(beta_image); } -#if defined(MAGICKCORE_OPENMP_SUPPORT) -# pragma omp critical (MagickCore_CompareImagesBound) -#endif - { - if (bounding_box.x < bounds.x) - bounds.x=bounding_box.x; - if (bounding_box.y < bounds.y) - bounds.y=bounding_box.y; - if (bounding_box.width > bounds.width) - bounds.width=bounding_box.width; - if (bounding_box.height > bounds.height) - bounds.height=bounding_box.height; - } + if (y < (ssize_t) alpha_image->rows) + break; } - beta_view=DestroyCacheView(beta_view); - alpha_view=DestroyCacheView(alpha_view);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/list.c ^
@@ -87,7 +87,7 @@ if (append == (Image ) NULL) return; assert(append->signature == MagickCoreSignature); - if (append->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",append->filename); if ((images) == (Image ) NULL) { @@ -233,10 +233,10 @@ assert(images != (const Image ) NULL); assert(images->signature == MagickCoreSignature); assert(scenes != (char ) NULL); - if (images->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); clone_images=NewImageList(); images=GetFirstImageInList(images); artifact=GetImageArtifact(images,"frames:step"); @@ -394,11 +394,11 @@ assert(images != (Image *) NULL); assert((images)->signature == MagickCoreSignature); assert(scenes != (char ) NULL); - if ((images)->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - (images)->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + (images)->filename); images=GetFirstImageInList(images); length=GetImageListLength(images); delete_list=(MagickBooleanType ) AcquireQuantumMemory(length, @@ -479,7 +479,7 @@ if (images == (Image ) NULL) return((Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); while (images != (Image ) NULL) DeleteImageFromList(&images); @@ -538,10 +538,10 @@ assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); assert(scenes != (char ) NULL); - if (images->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); duplicate_images=NewImageList(); for (i=0; i < (ssize_t) number_duplicates; i++) { @@ -628,7 +628,7 @@ if (images == (Image ) NULL) return((Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); if (index < 0) { @@ -716,7 +716,7 @@ if (images == (Image ) NULL) return(0); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); images=GetLastImageInList(images); for (i=0; images != (Image ) NULL; images=images->previous) @@ -788,7 +788,7 @@ if (images == (Image ) NULL) return((Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); return(images->next); } @@ -868,7 +868,7 @@ if (images == (Image ) NULL) return((Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); group=(Image ) AcquireQuantumMemory((size_t) GetImageListLength(images)+1UL, sizeof(group)); @@ -922,7 +922,7 @@ assert(images != (Image ) NULL); assert(insert != (Image ) NULL); assert(insert->signature == MagickCoreSignature); - if (insert->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",insert->filename); if ((images) == (Image ) NULL) return; @@ -1024,7 +1024,7 @@ if ((images) == (Image ) NULL) return((Image ) NULL); assert((images)->signature == MagickCoreSignature); - if ((images)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (images)->filename); p=(images); @@ -1083,7 +1083,7 @@ if ((images) == (Image ) NULL) return((Image ) NULL); assert((images)->signature == MagickCoreSignature); - if ((images)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (images)->filename); image=(images); @@ -1134,7 +1134,7 @@ if ((images) == (Image ) NULL) return((Image ) NULL); assert((images)->signature == MagickCoreSignature); - if ((images)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (images)->filename); image=(images); @@ -1183,7 +1183,7 @@ assert(images != (Image ) NULL); assert(replace != (Image ) NULL); assert(replace->signature == MagickCoreSignature); - if (replace->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",replace->filename); if ((images) == (Image ) NULL) return; @@ -1244,7 +1244,7 @@ assert(images != (Image *) NULL); assert(replace != (Image ) NULL); assert(replace->signature == MagickCoreSignature); - if (replace->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",replace->filename); if ((images) == (Image ) NULL) return; @@ -1305,7 +1305,7 @@ if ((images) == (Image ) NULL) return; assert((images)->signature == MagickCoreSignature); - if ((images)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (images)->filename); for (p=(images); p->next != (Image ) NULL; p=p->next) ; @@ -1362,7 +1362,7 @@ if ((images) == (Image ) NULL) return((Image ) NULL); assert((images)->signature == MagickCoreSignature); - if ((images)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (images)->filename); split=SplitImageList(images);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/locale.c ^
@@ -291,7 +291,8 @@ MagickExport LinkedListInfo DestroyLocaleOptions(LinkedListInfo messages) { assert(messages != (LinkedListInfo ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(DestroyLinkedList(messages,DestroyOptions)); } @@ -592,8 +593,9 @@ Allocate locale list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_messages != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_messages=0; p=GetLocaleInfo_("",exception); if (p == (const LocaleInfo ) NULL) @@ -687,8 +689,9 @@ Allocate locale list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_messages != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_messages=0; p=GetLocaleInfo_("",exception); if (p == (const LocaleInfo ) NULL) @@ -801,8 +804,9 @@ xml; assert(filename != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); (void) CopyMagickString(path,filename,MagickPathExtent); /* Load XML from configuration files to linked-list. @@ -871,7 +875,8 @@ / MagickExport const char GetLocaleValue(const LocaleInfo locale_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(locale_info != (LocaleInfo ) NULL); assert(locale_info->signature == MagickCoreSignature); return(locale_info->message);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/log.c ^
@@ -17,7 +17,7 @@ % September 2002 % % % % % -% Copyright @ 2002 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -383,6 +383,41 @@ % % % % % % +% G e t L o g E v e n t M a s k % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% GetLogEventMask() returns the current log event mask. +% +% The format of the GetLogEventMask method is: +% +% const char GetLogEventMask(void) +% +% +/ +MagickExport const LogEventType GetLogEventMask(void) +{ + ExceptionInfo + exception; + + LogInfo + log_info; + + exception=AcquireExceptionInfo(); + log_info=GetLogInfo("",exception); + exception=DestroyExceptionInfo(exception); + if (log_info == (const LogInfo ) NULL) + return(NoEvents); + return(log_info->event_mask); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % + G e t L o g I n f o % % % % % @@ -499,8 +534,9 @@ Allocate log list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_preferences != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_preferences=0; p=GetLogInfo("",exception); if (p == (const LogInfo ) NULL) @@ -592,8 +628,9 @@ Allocate log list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_preferences != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_preferences=0; p=GetLogInfo("",exception); if (p == (const LogInfo ) NULL) @@ -1192,6 +1229,7 @@ % o format: the output format. % / + static char TranslateEvent(const char module,const char function, const size_t line,const char domain,const char event) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/log.h ^
@@ -68,9 +68,12 @@ *GetLogList(const char ,size_t ,ExceptionInfo ); extern MagickExport const char - GetLogName(void), + GetLogName(void) magick_attribute((__pure__)), SetLogName(const char ); +extern MagickExport const LogEventType + GetLogEventMask(void) magick_attribute((__pure__)); + extern MagickExport const LogInfo *GetLogInfoList(const char ,size_t ,ExceptionInfo );
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/magic.c ^
@@ -389,7 +389,7 @@ max_offset=offset; p=(const MagicInfo ) GetNextValueInLinkedList(magic_list); } - if (max_offset > (MagickOffsetType) MAGICK_SSIZE_MAX) + if (max_offset > (MagickOffsetType) (MAGICK_SSIZE_MAX/2)) return(0); extent=(size_t) max_offset; UnlockSemaphoreInfo(magic_list_semaphore); @@ -462,8 +462,9 @@ Allocate magic list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_aliases != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_aliases=0; p=GetMagicInfo((const unsigned char ) NULL,0,exception); if (p == (const MagicInfo ) NULL) @@ -557,8 +558,9 @@ Allocate configure list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_aliases != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_aliases=0; p=GetMagicInfo((const unsigned char ) NULL,0,exception); if (p == (const MagicInfo ) NULL) @@ -608,9 +610,10 @@ / MagickExport const char GetMagicName(const MagicInfo magic_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(magic_info != (MagicInfo *) NULL); assert(magic_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(magic_info->name); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/magick.c ^
@@ -185,7 +185,8 @@ assert(magick_module != (const char ) NULL); assert(name != (const char ) NULL); assert(description != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",name); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",name); magick_info=(MagickInfo ) AcquireCriticalMemory(sizeof(magick_info)); (void) memset(magick_info,0,sizeof(magick_info)); magick_info->magick_module=ConstantString(magick_module); @@ -299,8 +300,9 @@ const MagickInfo p; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(magick != (const unsigned char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); exception=AcquireExceptionInfo(); p=GetMagickInfo("",exception); exception=DestroyExceptionInfo(exception); @@ -713,8 +715,9 @@ Allocate magick list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_formats != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_formats=0; p=GetMagickInfo("",exception); if (p == (const MagickInfo ) NULL) @@ -806,8 +809,9 @@ Allocate magick list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_formats != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_formats=0; p=GetMagickInfo("",exception); if (p == (const MagickInfo ) NULL) @@ -941,7 +945,8 @@ / MagickExport int GetMagickPrecision(void) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(SetMagickPrecision(0)); } @@ -1690,7 +1695,8 @@ / assert(magick_info != (MagickInfo ) NULL); assert(magick_info->signature == MagickCoreSignature); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",magick_info->name); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",magick_info->name); if (magick_list == (SplayTreeInfo *) NULL) return(MagickFalse); if ((GetMagickDecoderThreadSupport(magick_info) == MagickFalse) \|\| @@ -1756,7 +1762,8 @@ { #define MagickPrecision (4+MAGICKCORE_QUANTUM_DEPTH/8) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (precision > 0) magick_precision=precision; if ((precision < 0) \|\| (magick_precision == 0))
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/mime.c ^
@@ -449,8 +449,9 @@ Allocate mime list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_aliases != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_aliases=0; p=GetMimeInfo((char ) NULL,(unsigned char ) "",0,exception); if (p == (const MimeInfo ) NULL) @@ -544,8 +545,9 @@ Allocate configure list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_aliases != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_aliases=0; p=GetMimeInfo((char ) NULL,(unsigned char ) "",0,exception); if (p == (const MimeInfo ) NULL) @@ -595,9 +597,10 @@ / MagickExport const char GetMimeDescription(const MimeInfo mime_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(mime_info != (MimeInfo ) NULL); assert(mime_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(mime_info->description); } @@ -625,9 +628,10 @@ / MagickExport const char GetMimeType(const MimeInfo mime_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(mime_info != (MimeInfo ) NULL); assert(mime_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(mime_info->type); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/module.c ^
@@ -301,8 +301,9 @@ Allocate module list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_modules != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_modules=0; p=GetModuleInfo("",exception); if (p == (const ModuleInfo ) NULL) @@ -531,9 +532,10 @@ module_path; assert(filename != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); assert(path != (char ) NULL); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); if (strchr(filename,'/') != (char ) NULL) return(MagickFalse); (void) CopyMagickString(path,filename,MagickPathExtent); @@ -958,7 +960,7 @@ / assert(images != (Image *) NULL); assert((images)->signature == MagickCoreSignature); - if ((images)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (images)->filename); rights=ReadPolicyRights; @@ -1019,11 +1021,11 @@ size_t signature; - if ((images)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(ModuleEvent,GetMagickModule(), "Invoking \"%s\" dynamic image filter",tag); signature=image_filter(images,argc,argv,exception); - if ((images)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(ModuleEvent,GetMagickModule(),"\"%s\" completes", tag); if (signature != MagickImageFilterSignature) @@ -1426,7 +1428,8 @@ assert(module_info != (ModuleInfo ) NULL); assert(module_info->signature == MagickCoreSignature); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",module_info->tag); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",module_info->tag); if (module_list == (SplayTreeInfo ) NULL) return((const ModuleInfo ) NULL); status=AddValueToSplayTree(module_list,module_info->tag,module_info); @@ -1464,8 +1467,9 @@ static void TagToCoderModuleName(const char tag,char name) { assert(tag != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag); assert(name != (char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag); #if defined(MAGICKCORE_LTDL_DELEGATE) (void) FormatLocaleString(name,MagickPathExtent,"%s.la",tag); (void) LocaleLower(name); @@ -1513,8 +1517,9 @@ static void TagToFilterModuleName(const char tag,char name) { assert(tag != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag); assert(name != (char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag); #if defined(MAGICKCORE_WINDOWS_SUPPORT) (void) FormatLocaleString(name,MagickPathExtent,"FILTER_%s_.dll",tag); #elif !defined(MAGICKCORE_LTDL_DELEGATE) @@ -1558,9 +1563,10 @@ name[MagickPathExtent]; assert(tag != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag); assert(format != (const char ) NULL); assert(module != (char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag); (void) CopyMagickString(name,tag,MagickPathExtent); LocaleUpper(name); #if !defined(MAGICKCORE_NAMESPACE_PREFIX) @@ -1610,8 +1616,9 @@ Locate and execute UnregisterFORMATImage module. / assert(module_info != (const ModuleInfo ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",module_info->tag); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",module_info->tag); if (module_info->unregister_module == NULL) return(MagickTrue); module_info->unregister_module(); @@ -1646,7 +1653,7 @@ assert(image != (Image ) NULL); assert((image)->signature == MagickCoreSignature); - if ((image)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(image)->filename); rights=ReadPolicyRights; if (IsRightsAuthorized(FilterPolicyDomain,rights,tag) == MagickFalse) @@ -1678,12 +1685,12 @@ signature; if ((image)->debug != MagickFalse) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), + (void) LogMagickEvent(TransformEvent,GetMagickModule(), "Invoking \"%s\" static image filter",tag); signature=image_filter(image,argc,argv,exception); if ((image)->debug != MagickFalse) - (void) LogMagickEvent(CoderEvent,GetMagickModule(),"\"%s\" completes", - tag); + (void) LogMagickEvent(TransformEvent,GetMagickModule(), + "\"%s\" completes",tag); if (signature != MagickImageFilterSignature) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/monitor.h ^
@@ -41,7 +41,7 @@ return(MagickTrue); if (offset == (MagickOffsetType) (span-1)) return(MagickTrue); - if ((offset % (span/100)) == 0) + if ((offset % (MagickOffsetType) (span/100)) == 0) return(MagickTrue); return(MagickFalse); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/montage.c ^
@@ -164,9 +164,9 @@ MagickExport MontageInfo DestroyMontageInfo(MontageInfo montage_info) { assert(montage_info != (MontageInfo ) NULL); - if (montage_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(montage_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (montage_info->geometry != (char ) NULL) montage_info->geometry=(char ) RelinquishMagickMemory(montage_info->geometry); @@ -216,10 +216,10 @@ { assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + assert(montage_info != (MontageInfo ) NULL); + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - assert(montage_info != (MontageInfo ) NULL); (void) memset(montage_info,0,sizeof(montage_info)); (void) CopyMagickString(montage_info->filename,image_info->filename, MagickPathExtent); @@ -403,12 +403,12 @@ / assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(montage_info != (MontageInfo ) NULL); assert(montage_info->signature == MagickCoreSignature); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); number_images=GetImageListLength(images); primary_list=ImageListToArray(images,exception); if (primary_list == (Image *) NULL)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/morphology.c ^
@@ -4153,6 +4153,12 @@ KernelInfo curr_kernel; + assert(image != (const Image ) NULL); + assert(image->signature == MagickCoreSignature); + assert(exception != (ExceptionInfo ) NULL); + assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); curr_kernel = (KernelInfo ) kernel; bias=0.0; compose = UndefinedCompositeOp; /* use default for method */
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/nt-base.c ^
@@ -512,8 +512,9 @@ / MagickPrivate int NTCloseDirectory(DIR entry) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(entry != (DIR ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); FindClose(entry->hSearch); entry=(DIR ) RelinquishMagickMemory(entry); return(0); @@ -1328,6 +1329,8 @@ ghost_info.new_instance=NTGhostscriptNewInstance; ghost_info.run_string=(int (MagickDLLCall )(gs_main_instance ,const char , int,int )) (lt_dlsym(ghost_handle,"gsapi_run_string")); + ghost_info.set_arg_encoding=(int (MagickDLLCall)(gs_main_instance, int)) ( + lt_dlsym(ghost_handle, "gsapi_set_arg_encoding")); ghost_info.set_stdio=(int (MagickDLLCall )(gs_main_instance ,int( MagickDLLCall )(void ,char ,int),int(MagickDLLCall )(void , const char ,int),int(MagickDLLCall )(void ,const char ,int))) @@ -2081,7 +2084,8 @@ value; assert(id != (const char *) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",id); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",id); #ifdef MAGICKCORE_LIBRARY_NAME handle=GetModuleHandle(MAGICKCORE_LIBRARY_NAME); #else
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/option.c ^
@@ -2219,11 +2219,11 @@ { assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(clone_info != (const ImageInfo ) NULL); assert(clone_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); if (clone_info->options != (void ) NULL) { if (image_info->options != (void ) NULL) @@ -2316,7 +2316,7 @@ { assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); if (image_info->options == (void ) NULL) @@ -2351,7 +2351,7 @@ { assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); if (image_info->options != (void ) NULL) @@ -2391,7 +2391,7 @@ { assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); if (image_info->options == (void ) NULL) @@ -2695,7 +2695,7 @@ { assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); if (image_info->options == (void ) NULL) @@ -3236,7 +3236,7 @@ assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); if (image_info->options == (void ) NULL) @@ -3273,7 +3273,7 @@ { assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); if (image_info->options == (void ) NULL) @@ -3309,7 +3309,7 @@ { assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); if (image_info->options == (void ) NULL) @@ -3349,7 +3349,7 @@ { assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); /
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/paint.c ^
@@ -174,10 +174,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(draw_info != (DrawInfo ) NULL); assert(draw_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((x_offset < 0) \|\| (x_offset >= (ssize_t) image->columns)) return(MagickFalse); if ((y_offset < 0) \|\| (y_offset >= (ssize_t) image->rows)) @@ -427,10 +427,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(stops != (const StopInfo ) NULL); assert(number_stops > 0); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); draw_info=AcquireDrawInfo(); gradient=(&draw_info->gradient); gradient->type=type; @@ -720,10 +720,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); width=GetOptimalKernelWidth2D(radius,sigma); linear_image=CloneImage(image,0,0,MagickTrue,exception); paint_image=CloneImage(image,0,0,MagickTrue,exception); @@ -935,7 +935,7 @@ assert(image->signature == MagickCoreSignature); assert(target != (PixelInfo ) NULL); assert(fill != (PixelInfo ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); @@ -1082,7 +1082,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); assert(target != (PixelInfo ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); @@ -1211,7 +1211,7 @@ assert(image->signature == MagickCoreSignature); assert(high != (PixelInfo ) NULL); assert(low != (PixelInfo *) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/pixel-accessor.h ^
@@ -32,7 +32,7 @@ #undef index -static inline Quantum ClampPixel(const MagickRealType pixel) +static inline const Quantum ClampPixel(const MagickRealType pixel) { if (pixel < 0.0f) return((Quantum) 0); @@ -45,13 +45,13 @@ #endif } -static inline Quantum GetPixela(const Image magick_restrict image, +static inline const Quantum GetPixela(const Image magick_restrict image, const Quantum magick_restrict pixel) { return(pixel[image->channel_map[aPixelChannel].offset]); } -static inline Quantum GetPixelAlpha(const Image magick_restrict image, +static inline const Quantum GetPixelAlpha(const Image magick_restrict image, const Quantum magick_restrict pixel) { if (image->channel_map[AlphaPixelChannel].traits == UndefinedPixelTrait) @@ -59,19 +59,19 @@ return(pixel[image->channel_map[AlphaPixelChannel].offset]); } -static inline PixelTrait GetPixelAlphaTraits( +static inline const PixelTrait GetPixelAlphaTraits( const Image magick_restrict image) { return(image->channel_map[AlphaPixelChannel].traits); } -static inline Quantum GetPixelb(const Image magick_restrict image, +static inline const Quantum GetPixelb(const Image magick_restrict image, const Quantum magick_restrict pixel) { return(pixel[image->channel_map[bPixelChannel].offset]); } -static inline Quantum GetPixelBlack(const Image magick_restrict image, +static inline const Quantum GetPixelBlack(const Image magick_restrict image, const Quantum magick_restrict pixel) { if (image->channel_map[BlackPixelChannel].traits == UndefinedPixelTrait) @@ -79,35 +79,37 @@ return(pixel[image->channel_map[BlackPixelChannel].offset]); } -static inline PixelTrait GetPixelBlackTraits( +static inline const PixelTrait GetPixelBlackTraits( const Image magick_restrict image) { return(image->channel_map[BlackPixelChannel].traits); } -static inline Quantum GetPixelBlue(const Image magick_restrict image, +static inline const Quantum GetPixelBlue(const Image magick_restrict image, const Quantum magick_restrict pixel) { return(pixel[image->channel_map[BluePixelChannel].offset]); } -static inline PixelTrait GetPixelBlueTraits(const Image magick_restrict image) +static inline const PixelTrait GetPixelBlueTraits( + const Image magick_restrict image) { return(image->channel_map[BluePixelChannel].traits); } -static inline Quantum GetPixelCb(const Image magick_restrict image, +static inline const Quantum GetPixelCb(const Image magick_restrict image, const Quantum magick_restrict pixel) { return(pixel[image->channel_map[CbPixelChannel].offset]); } -static inline PixelTrait GetPixelCbTraits(const Image magick_restrict image) +static inline const PixelTrait GetPixelCbTraits( + const Image magick_restrict image) { return(image->channel_map[CbPixelChannel].traits); } -static inline Quantum GetPixelChannel(const Image magick_restrict image, +static inline const Quantum GetPixelChannel(const Image magick_restrict image, const PixelChannel channel,const Quantum magick_restrict pixel) { if (image->channel_map[channel].traits == UndefinedPixelTrait) @@ -115,83 +117,86 @@ return(pixel[image->channel_map[channel].offset]); } -static inline PixelChannel GetPixelChannelChannel( +static inline const PixelChannel GetPixelChannelChannel( const Image magick_restrict image,const ssize_t offset) { return(image->channel_map[offset].channel); } -static inline ssize_t GetPixelChannelOffset(const Image magick_restrict image, - const PixelChannel channel) +static inline const ssize_t GetPixelChannelOffset( + const Image magick_restrict image,const PixelChannel channel) { return(image->channel_map[channel].offset); } -static inline PixelTrait GetPixelChannelTraits( +static inline const PixelTrait GetPixelChannelTraits( const Image magick_restrict image,const PixelChannel channel) { return(image->channel_map[channel].traits); } -static inline size_t GetPixelChannels(const Image magick_restrict image) +static inline const size_t GetPixelChannels(const Image magick_restrict image) { return(image->number_channels); } -static inline Quantum GetPixelCompositeMask(const Image magick_restrict image, - const Quantum magick_restrict pixel) +static inline const Quantum GetPixelCompositeMask( + const Image magick_restrict image,const Quantum magick_restrict pixel) { if (image->channel_map[CompositeMaskPixelChannel].traits == UndefinedPixelTrait) return((Quantum) QuantumRange); return(pixel[image->channel_map[CompositeMaskPixelChannel].offset]); } -static inline Quantum GetPixelCr(const Image magick_restrict image, +static inline const Quantum GetPixelCr(const Image magick_restrict image, const Quantum magick_restrict pixel) { return(pixel[image->channel_map[CrPixelChannel].offset]); } -static inline PixelTrait GetPixelCrTraits(const Image magick_restrict image) +static inline const PixelTrait GetPixelCrTraits( + const Image magick_restrict image) { return(image->channel_map[CrPixelChannel].traits); } -static inline Quantum GetPixelCyan(const Image magick_restrict image, +static inline const Quantum GetPixelCyan(const Image magick_restrict image, const Quantum magick_restrict pixel) { return(pixel[image->channel_map[CyanPixelChannel].offset]); } -static inline PixelTrait GetPixelCyanTraits(const Image magick_restrict image) +static inline const PixelTrait GetPixelCyanTraits( + const Image magick_restrict image) { return(image->channel_map[CyanPixelChannel].traits); } -static inline Quantum GetPixelGray(const Image magick_restrict image, +static inline const Quantum GetPixelGray(const Image magick_restrict image, const Quantum magick_restrict pixel) { return(pixel[image->channel_map[GrayPixelChannel].offset]); } -static inline PixelTrait GetPixelGrayTraits(const Image magick_restrict image) +static inline const PixelTrait GetPixelGrayTraits( + const Image magick_restrict image) { return(image->channel_map[GrayPixelChannel].traits); } -static inline Quantum GetPixelGreen(const Image magick_restrict image, +static inline const Quantum GetPixelGreen(const Image magick_restrict image, const Quantum magick_restrict pixel) { return(pixel[image->channel_map[GreenPixelChannel].offset]); } -static inline PixelTrait GetPixelGreenTraits( +static inline const PixelTrait GetPixelGreenTraits( const Image magick_restrict image) { return(image->channel_map[GreenPixelChannel].traits); } -static inline Quantum GetPixelIndex(const Image magick_restrict image, +static inline const Quantum GetPixelIndex(const Image magick_restrict image, const Quantum *magick_restrict pixel) { if (image->channel_map[IndexPixelChannel].traits == UndefinedPixelTrait) @@ -199,13 +204,13 @@ return(pixel[image->channel_map[IndexPixelChannel].offset]); } -static inline PixelTrait GetPixelIndexTraits(
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/pixel-private.h ^
@@ -22,10 +22,6 @@ extern "C" { #endif -#ifndef StartMetaPixelChannel - #define StartMetaPixelChannel ((PixelChannel) (CompositeMaskPixelChannel+1)) -#endif - #if defined(__cplusplus) \|\| defined(c_plusplus) } #endif
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/pixel.c ^
@@ -1982,7 +1982,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); length=strlen(map); quantum_map=(QuantumType ) AcquireQuantumMemory(length,sizeof(quantum_map)); @@ -4159,7 +4159,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); length=strlen(map); quantum_map=(QuantumType ) AcquireQuantumMemory(length,sizeof(quantum_map)); @@ -4381,7 +4381,7 @@ ssize_t i; - meta_channel=StartMetaPixelChannel; + meta_channel=MetaPixelChannels; for (i=0; i < (ssize_t) image->number_meta_channels; i++) { assert(meta_channel < MaxPixelChannels); @@ -6328,7 +6328,7 @@ SetPixelChannelTraits(image,WriteMaskPixelChannel,CopyPixelTrait); if ((image->channels & CompositeMaskChannel) != 0) SetPixelChannelTraits(image,CompositeMaskPixelChannel,CopyPixelTrait); - if (image->debug != MagickFalse) + if ((GetLogEventMask() & PixelEvent) != 0) LogPixelChannels(image); return(mask); } @@ -6364,7 +6364,7 @@ const size_t number_meta_channels,ExceptionInfo exception) { image->number_meta_channels=MagickMin(number_meta_channels,MaxPixelChannels - -(size_t) StartMetaPixelChannel); + -(size_t) MetaPixelChannels); InitializePixelChannelMap(image); return(SyncImagePixelCache(image,exception)); } @@ -6416,7 +6416,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; progress=0;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/pixel.h ^
@@ -91,6 +91,7 @@ WriteMaskPixelChannel = 7, MetaPixelChannel = 8, CompositeMaskPixelChannel = 9, + MetaPixelChannels = 10, IntensityPixelChannel = MaxPixelChannels, /* ???? / CompositePixelChannel = MaxPixelChannels, / ???? / SyncPixelChannel = MaxPixelChannels+1 / not a real channel */
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/policy.c ^
@@ -381,8 +381,9 @@ Allocate policy list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_policies != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_policies=0; p=GetPolicyInfo("",exception); if (p == (const PolicyInfo ) NULL) @@ -477,8 +478,9 @@ Allocate policy list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_policies != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_policies=0; p=GetPolicyInfo("",exception); if (p == (const PolicyInfo ) NULL) @@ -540,7 +542,8 @@ exception; assert(name != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",name); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",name); exception=AcquireExceptionInfo(); policy_info=GetPolicyInfo(name,exception); exception=DestroyExceptionInfo(exception); @@ -632,7 +635,7 @@ PolicyInfo p; - if (IsEventLogging() != MagickFalse) + if ((GetLogEventMask() & PolicyEvent) != 0) (void) LogMagickEvent(PolicyEvent,GetMagickModule(), "Domain: %s; rights=%s; pattern=\"%s\" ...", CommandOptionToMnemonic(MagickPolicyDomainOptions,domain), @@ -881,8 +884,8 @@ file_xml=FileToXML(path,~0UL); if (file_xml != (char ) NULL) { - status&=LoadPolicyCache(cache,file_xml,path, - depth+1,exception); + status&=LoadPolicyCache(cache,file_xml,path,depth+1, + exception); file_xml=DestroyString(file_xml); } }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/prepress.c ^
@@ -99,9 +99,9 @@ y; assert(image != (Image *) NULL); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (image->colorspace != CMYKColorspace) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/profile.c ^
@@ -154,10 +154,10 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(clone_image != (const Image ) NULL); assert(clone_image->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (clone_image->profiles != (void ) NULL) { if (image->profiles != (void ) NULL) @@ -196,7 +196,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->profiles == (SplayTreeInfo ) NULL) return(MagickFalse); @@ -264,7 +264,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->profiles == (SplayTreeInfo ) NULL) return((StringInfo ) NULL); @@ -299,7 +299,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->profiles == (SplayTreeInfo ) NULL) return((char ) NULL); @@ -958,9 +958,9 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(name != (const char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((datum == (const void ) NULL) \|\| (length == 0)) { char @@ -1481,7 +1481,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->profiles == (SplayTreeInfo ) NULL) return((StringInfo ) NULL); @@ -1519,7 +1519,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->profiles == (SplayTreeInfo ) NULL) return; @@ -1963,7 +1963,7 @@ assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); clone_profile=CloneStringInfo(profile); PatchCorruptProfile(name,clone_profile);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/property.c ^
@@ -136,13 +136,14 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(clone_image != (const Image ) NULL); assert(clone_image->signature == MagickCoreSignature); - if (clone_image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - clone_image->filename); + if (IsEventLogging() != MagickFalse) + { + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + clone_image->filename); + } (void) CopyMagickString(image->filename,clone_image->filename, MagickPathExtent); (void) CopyMagickString(image->magick_filename,clone_image->magick_filename, @@ -281,7 +282,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->properties == (void ) NULL) return(MagickFalse); @@ -315,7 +316,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->properties != (void ) NULL) image->properties=(void ) DestroySplayTree((SplayTreeInfo ) @@ -1486,7 +1487,20 @@ case EXIF_FMT_BYTE: case EXIF_FMT_UNDEFINED: { - EXIFMultipleValues(1,"%.20g",(double) ((unsigned char ) p1)); + value=(char ) NULL; + if (~((size_t) number_bytes) >= 1) + value=(char ) AcquireQuantumMemory((size_t) number_bytes+1UL, + sizeof(value)); + if (value != (char ) NULL) + { + for (i=0; i < (ssize_t) number_bytes; i++) + { + value[i]='.'; + if (isprint((int) p[i]) != 0) + value[i]=(char) p[i]; + } + value[i]='\0'; + } break; } case EXIF_FMT_SBYTE: @@ -1532,12 +1546,14 @@ } case EXIF_FMT_SINGLE: { - EXIFMultipleValues(4,"%f",(double) (float ) p1); + EXIFMultipleValues(4,"%.20g",(double) + ReadPropertySignedLong(endian,p1)); break; } case EXIF_FMT_DOUBLE: { - EXIFMultipleValues(8,"%f",(double ) p1); + EXIFMultipleValues(8,"%.20g",(double) + ReadPropertySignedLong(endian,p1)); break; } case EXIF_FMT_STRING: @@ -1679,6 +1695,9 @@ const StringInfo profile; + / + Return ICC profile property. + / magick_unreferenced(property); profile=GetImageProfile(image,"icc"); if (profile == (StringInfo ) NULL) @@ -1704,48 +1723,58 @@ if (name != (const char ) NULL) (void) SetImageProperty((Image ) image,"icc:name",name,exception); #else - char - info[MagickPathExtent]; + StringInfo + info; unsigned int extent; - (void) memset(info,0,sizeof(info)); + info=AcquireStringInfo(0); extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoDescription,"en","US", NULL,0); if (extent != 0) { + SetStringInfoLength(info,extent+1); extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoDescription,"en", - "US",info,MagickMin(MagickPathExtent-1,extent)); - (void) SetImageProperty((Image ) image,"icc:description",info, - exception); + "US",(char ) GetStringInfoDatum(info),extent); + if (extent != 0) + (void) SetImageProperty((Image ) image,"icc:description", + (char ) GetStringInfoDatum(info),exception); } extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoManufacturer,"en","US", NULL,0); if (extent != 0) { + SetStringInfoLength(info,extent+1); extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoManufacturer,"en", - "US",info,MagickMin(MagickPathExtent-1,extent)); - (void) SetImageProperty((Image ) image,"icc:manufacturer",info, - exception); + "US",(char ) GetStringInfoDatum(info),extent); + if (extent != 0) + (void) SetImageProperty((Image ) image,"icc:manufacturer", + (char ) GetStringInfoDatum(info),exception); } extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoModel,"en","US", NULL,0); if (extent != 0) { + SetStringInfoLength(info,extent+1); extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoModel,"en","US", - info,MagickMin(MagickPathExtent-1,extent)); - (void) SetImageProperty((Image ) image,"icc:model",info,exception); + (char ) GetStringInfoDatum(info),extent); + if (extent != 0) + (void) SetImageProperty((Image ) image,"icc:model", + (char ) GetStringInfoDatum(info),exception); } extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoCopyright,"en","US", NULL,0); if (extent != 0) { + SetStringInfoLength(info,extent+1); extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoCopyright,"en", - "US",info,MagickMin(MagickPathExtent-1,extent)); - (void) SetImageProperty((Image ) image,"icc:copyright",info, - exception); + "US",(char ) GetStringInfoDatum(info),extent); + if (extent != 0) + (void) SetImageProperty((Image ) image,"icc:copyright", + (char ) GetStringInfoDatum(info),exception); } + info=DestroyStringInfo(info); #endif (void) cmsCloseProfile(icc_profile); } @@ -2227,13 +2256,13 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((property == (const char ) NULL) \|\| (property == '\0')) return((const char ) NULL); read_from_properties=MagickTrue; property_length=strlen(property); - if (property_length > 2 && ((property+(property_length-2)) == ':') && + if ((property_length > 2) && ((property+(property_length-2)) == ':') && ((property+(property_length-1)) == '')) read_from_properties=MagickFalse; if (read_from_properties != MagickFalse) @@ -2241,9 +2270,6 @@ p=(const char ) NULL; if (image->properties != (void ) NULL) { - if (property == (const char ) NULL) - return((const char ) GetRootValueFromSplayTree((SplayTreeInfo ) - image->properties)); p=(const char ) GetValueFromSplayTree((SplayTreeInfo ) image->properties,property); if (p != (const char ) NULL) @@ -2426,12 +2452,12 @@ const char string; /* return a string already stored somewher / - if ((image != (Image ) NULL) && (image->debug != MagickFalse)) + if ((image != (Image ) NULL) && (IsEventLogging() != MagickFalse)) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); else if ((image_info != (ImageInfo ) NULL) && - (image_info->debug != MagickFalse)) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s","no-images"); + (IsEventLogging() != MagickFalse)) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s","no-images"); value='\0'; / formatted string */
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/quantize.c ^
@@ -1194,7 +1194,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (IsPaletteImage(image) == MagickFalse) return(MagickFalse); @@ -1384,9 +1384,10 @@ / MagickExport QuantizeInfo DestroyQuantizeInfo(QuantizeInfo quantize_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(quantize_info != (QuantizeInfo ) NULL); assert(quantize_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); quantize_info->signature=(~MagickCoreSignature); quantize_info=(QuantizeInfo ) RelinquishMagickMemory(quantize_info); return(quantize_info); @@ -2224,7 +2225,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); image->total_colors=GetNumberColors(image,(FILE ) NULL,exception); (void) memset(&image->error,0,sizeof(image->error)); @@ -2309,8 +2310,9 @@ / MagickExport void GetQuantizeInfo(QuantizeInfo quantize_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(quantize_info != (QuantizeInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); (void) memset(quantize_info,0,sizeof(quantize_info)); quantize_info->number_colors=256; quantize_info->dither_method=RiemersmaDitherMethod; @@ -2472,18 +2474,18 @@ verbose, status; - ssize_t - n; - size_t + n, number_threads; assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); + if (max_iterations == 0) + return(MagickFalse); colors=GetImageArtifact(image,"kmeans:seed-colors"); if (colors == (const char ) NULL) { @@ -2539,7 +2541,7 @@ status=AcquireImageColormap(image,number_colors,exception); if (status == MagickFalse) return(status); - for (n=0, p=colors; n < (ssize_t) image->colors; n++) + for (n=0, p=colors; n < image->colors; n++) { const char q; @@ -2558,7 +2560,7 @@ } p=q+1; } - if (n < (ssize_t) image->colors) + if (n < image->colors) { RandomInfo random_info; @@ -2567,7 +2569,7 @@ Seed clusters from random values. / random_info=AcquireRandomInfo(); - for ( ; n < (ssize_t) image->colors; n++) + for ( ; n < image->colors; n++) { (void) QueryColorCompliance("#000",AllCompliance,image->colormap+n, exception); @@ -2593,7 +2595,7 @@ verbose=IsStringTrue(GetImageArtifact(image,"debug")); number_threads=(size_t) GetMagickResourceLimit(ThreadResource); image_view=AcquireAuthenticCacheView(image,exception); - for (n=0; n < (ssize_t) max_iterations; n++) + for (n=0; n < max_iterations; n++) { double distortion; @@ -2810,10 +2812,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ @@ -3104,10 +3106,10 @@ assert(quantize_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); maximum_colors=quantize_info->number_colors; if (maximum_colors == 0) maximum_colors=MaxColormapSize; @@ -3149,8 +3151,13 @@ Reduce the number of colors in the image. / if (cube_info->colors > cube_info->maximum_colors) - ReduceImageColors(image,cube_info); - status=AssignImageColors(image,cube_info,exception); + { + ReduceImageColors(image,cube_info); + status=AssignImageColors(image,cube_info,exception); + } + else + status=KmeansImage(image,cube_info->maximum_colors,300,0.0001, + exception); } DestroyCubeInfo(cube_info); return(status); @@ -3214,10 +3221,10 @@ assert(quantize_info->signature == MagickCoreSignature); assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); if (GetNextImageInList(images) == (Image ) NULL) { /* @@ -3573,12 +3580,12 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(remap_image != (Image ) NULL); assert(remap_image->signature == MagickCoreSignature); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); cube_info=GetCubeInfo(quantize_info,MaxTreeDepth, quantize_info->number_colors); if (cube_info == (CubeInfo ) NULL) @@ -3641,10 +3648,10 @@ assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); image=images; if (remap_image == (Image ) NULL) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/quantum-export.c ^
@@ -1685,15 +1685,16 @@ { for (x=0; x < (ssize_t) number_pixels; x++) { - float - float_pixel; - - q=PopQuantumFloatPixel(quantum_info,(float) GetPixelRed(image,p),q); - q=PopQuantumFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q); - q=PopQuantumFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q); - q=PopQuantumFloatPixel(quantum_info,(float) GetPixelBlack(image,p),q); - float_pixel=(float) (GetPixelAlpha(image,p)); - q=PopQuantumFloatPixel(quantum_info,float_pixel,q); + q=PopQuantumFloatPixel(quantum_info,(float) + GetPixelRed(image,p),q); + q=PopQuantumFloatPixel(quantum_info,(float) + GetPixelGreen(image,p),q); + q=PopQuantumFloatPixel(quantum_info,(float) + GetPixelBlue(image,p),q); + q=PopQuantumFloatPixel(quantum_info,(float) + GetPixelBlack(image,p),q); + q=PopQuantumFloatPixel(quantum_info,(float) + GetPixelAlpha(image,p),q); p+=GetPixelChannels(image); q+=quantum_info->pad; } @@ -1720,17 +1721,18 @@ { if (quantum_info->format == FloatingPointQuantumFormat) { - double - pixel; - for (x=0; x < (ssize_t) number_pixels; x++) { - q=PopQuantumDoublePixel(quantum_info,(double) GetPixelRed(image,p),q); - q=PopQuantumDoublePixel(quantum_info,(double) GetPixelGreen(image,p),q); - q=PopQuantumDoublePixel(quantum_info,(double) GetPixelBlue(image,p),q); - q=PopQuantumDoublePixel(quantum_info,(double) GetPixelBlack(image,p),q); - pixel=(double) (GetPixelAlpha(image,p)); - q=PopQuantumDoublePixel(quantum_info,pixel,q); + q=PopQuantumDoublePixel(quantum_info,(double) + GetPixelRed(image,p),q); + q=PopQuantumDoublePixel(quantum_info,(double) + GetPixelGreen(image,p),q); + q=PopQuantumDoublePixel(quantum_info,(double) + GetPixelBlue(image,p),q); + q=PopQuantumDoublePixel(quantum_info,(double) + GetPixelBlack(image,p),q); + q=PopQuantumDoublePixel(quantum_info,(double) + GetPixelAlpha(image,p),q); p+=GetPixelChannels(image); q+=quantum_info->pad; } @@ -2503,8 +2505,6 @@ ssize_t bit; - assert(exception != (ExceptionInfo ) NULL); - assert(exception->signature == MagickCoreSignature); if (image->storage_class != PseudoClass) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, @@ -2673,8 +2673,6 @@ ssize_t bit; - assert(exception != (ExceptionInfo ) NULL); - assert(exception->signature == MagickCoreSignature); if (image->storage_class != PseudoClass) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, @@ -2860,6 +2858,131 @@ } } +static void ExportMultispectralQuantum(const Image image, + QuantumInfo quantum_info,const MagickSizeType number_pixels, + const Quantum magick_restrict p,unsigned char magick_restrict q, + ExceptionInfo exception) +{ + ssize_t + i, + x; + + if (image->number_meta_channels == 0) + { + (void) ThrowMagickException(exception,GetMagickModule(),ImageError, + "MultispectralImageRequired","`%s'",image->filename); + return; + } + switch (quantum_info->depth) + { + case 8: + { + unsigned char + pixel; + + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + pixel=ScaleQuantumToChar(p[i]); + q=PopCharPixel(pixel,q); + } + p+=GetPixelChannels(image); + q+=quantum_info->pad; + } + break; + } + case 16: + { + unsigned short + pixel; + + if (quantum_info->format == FloatingPointQuantumFormat) + { + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + pixel=SinglePrecisionToHalf(QuantumScalep[i]); + q=PopShortPixel(quantum_info->endian,pixel,q); + } + p+=GetPixelChannels(image); + q+=quantum_info->pad; + } + break; + } + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + pixel=ScaleQuantumToShort(p[i]); + q=PopShortPixel(quantum_info->endian,pixel,q); + } + p+=GetPixelChannels(image); + q+=quantum_info->pad; + } + break; + } + case 32: + { + unsigned int + pixel; + + if (quantum_info->format == FloatingPointQuantumFormat) + { + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + q=PopQuantumFloatPixel(quantum_info,(float) p[i],q); + p+=GetPixelChannels(image); + q+=quantum_info->pad; + } + break; + } + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + pixel=ScaleQuantumToLong(p[i]); + q=PopLongPixel(quantum_info->endian,pixel,q); + } + p+=GetPixelChannels(image); + q+=quantum_info->pad; + } + break; + } + case 64: + { + if (quantum_info->format == FloatingPointQuantumFormat) + { + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + q=PopQuantumDoublePixel(quantum_info,(double) p[i],q); + p+=GetPixelChannels(image); + q+=quantum_info->pad; + } + break; + } + } + default: + { + QuantumAny + range; + + range=GetQuantumRange(quantum_info->depth); + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(p[i],range),q); + p+=GetPixelChannels(image); + q+=quantum_info->pad; + } + break; + } + } +}
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/quantum-import.c ^
@@ -3492,6 +3492,171 @@ "InvalidColormapIndex","`%s'",image->filename); } +static void ImportMultispectralQuantum(const Image image, + QuantumInfo quantum_info,const MagickSizeType number_pixels, + const unsigned char magick_restrict p,Quantum magick_restrict q, + ExceptionInfo exception) +{ + QuantumAny + range; + + ssize_t + i, + x; + + if (image->number_meta_channels == 0) + { + (void) ThrowMagickException(exception,GetMagickModule(),ImageError, + "MultispectralImageRequired","`%s'",image->filename); + return; + } + switch (quantum_info->depth) + { + case 8: + { + unsigned char + pixel; + + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + p=PushCharPixel(p,&pixel); + q[i]=ScaleCharToQuantum(pixel); + } + p+=quantum_info->pad; + q+=GetPixelChannels(image); + } + break; + } + case 16: + { + unsigned short + pixel; + + if (quantum_info->format == FloatingPointQuantumFormat) + { + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + p=PushShortPixel(quantum_info->endian,p,&pixel); + q[i]=ClampToQuantum(QuantumRangeHalfToSinglePrecision(pixel)); + } + p+=quantum_info->pad; + q+=GetPixelChannels(image); + } + break; + } + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + p=PushShortPixel(quantum_info->endian,p,&pixel); + q[i]=ScaleShortToQuantum(pixel); + } + p+=quantum_info->pad; + q+=GetPixelChannels(image); + } + break; + } + case 24: + { + if (quantum_info->format == FloatingPointQuantumFormat) + { + float + pixel; + + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + p=PushQuantumFloat24Pixel(quantum_info,p,&pixel); + q[i]=ClampToQuantum(pixel); + } + p+=quantum_info->pad; + q+=GetPixelChannels(image); + } + break; + } + } + case 32: + { + if (quantum_info->format == FloatingPointQuantumFormat) + { + float + pixel; + + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + p=PushQuantumFloatPixel(quantum_info,p,&pixel); + q[i]=ClampToQuantum(pixel); + } + p+=quantum_info->pad; + q+=GetPixelChannels(image); + } + break; + } + else + { + unsigned int + pixel; + + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + p=PushLongPixel(quantum_info->endian,p,&pixel); + q[i]=ScaleLongToQuantum(pixel); + } + p+=quantum_info->pad; + q+=GetPixelChannels(image); + } + break; + } + } + case 64: + { + if (quantum_info->format == FloatingPointQuantumFormat) + { + double + pixel; + + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + p=PushDoublePixel(quantum_info,p,&pixel); + q[i]=ClampToQuantum(pixel); + } + p+=quantum_info->pad; + q+=GetPixelChannels(image); + } + break; + } + } + default: + { + unsigned int + pixel = 0; + + range=GetQuantumRange(quantum_info->depth); + for (x=0; x < (ssize_t) number_pixels; x++) + { + for (i=0; i < (ssize_t) GetImageChannels(image); i++) + { + p=PushQuantumPixel(quantum_info,p,&pixel); + q[i]=ScaleAnyToQuantum(pixel,range); + } + q+=GetPixelChannels(image); + } + break; + } + } +} + static void ImportOpacityQuantum(const Image image,QuantumInfo quantum_info, const MagickSizeType number_pixels,const unsigned char magick_restrict p, Quantum magick_restrict q) @@ -4658,10 +4823,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(quantum_info != (QuantumInfo ) NULL); assert(quantum_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (pixels == (const unsigned char ) NULL) pixels=(const unsigned char ) GetQuantumPixels(quantum_info); x=0; @@ -4721,6 +4886,11 @@ ImportCMYKAQuantum(image,quantum_info,number_pixels,p,q,exception); break; } + case MultispectralQuantum: + { + ImportMultispectralQuantum(image,quantum_info,number_pixels,p,q,exception); + break; + } case CMYKOQuantum: { ImportCMYKOQuantum(image,quantum_info,number_pixels,p,q,exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/quantum.c ^
@@ -323,6 +323,7 @@ case BGRAQuantum: packet_size=4; break; case CMYKQuantum: packet_size=4; break; case CMYKAQuantum: packet_size=5; break; + case MultispectralQuantum: packet_size=6; break; case CbYCrAQuantum: packet_size=4; break; case CbYCrQuantum: packet_size=3; break; case CbYCrYQuantum: packet_size=4; break; @@ -527,7 +528,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) exception; quantum_type=RGBQuantum; @@ -551,6 +552,8 @@ if (image->alpha_trait != UndefinedPixelTrait) quantum_type=IndexAlphaQuantum; } + if (image->number_meta_channels != 0) + quantum_type=MultispectralQuantum; return(quantum_type); } @@ -671,10 +674,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(quantum_info != (QuantumInfo ) NULL); assert(quantum_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); quantum_info->depth=MagickMin(depth,64); if (quantum_info->format == FloatingPointQuantumFormat) { @@ -689,13 +692,21 @@ else quantum_info->depth=16; } - if (quantum_info->pixels != (MemoryInfo *) NULL) - DestroyQuantumPixels(quantum_info); - quantum=(quantum_info->pad+MaxPixelChannels)(quantum_info->depth+7)/8; + /* + Speculative allocation since we don't yet know the quantum type. + / + quantum=(GetPixelChannels(image)+quantum_info->pad+3) + ((quantum_info->depth+7)/8)sizeof(double); extent=MagickMax(image->columns,image->rows)quantum; if ((MagickMax(image->columns,image->rows) != 0) && (quantum != (extent/MagickMax(image->columns,image->rows)))) return(MagickFalse); + if (quantum_info->pixels != (MemoryInfo *) NULL) + { + if (extent <= quantum_info->extent) + return(MagickTrue); + DestroyQuantumPixels(quantum_info); + } return(AcquireQuantumPixels(quantum_info,extent)); } @@ -731,10 +742,10 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(quantum_info != (QuantumInfo ) NULL); assert(quantum_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); quantum_info->endian=endian; return(SetQuantumDepth(image,quantum_info,quantum_info->depth)); } @@ -771,10 +782,10 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(quantum_info != (QuantumInfo ) NULL); assert(quantum_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); quantum_info->format=format; return(SetQuantumDepth(image,quantum_info,quantum_info->depth)); } @@ -810,7 +821,7 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); switch (quantum_type) { @@ -834,6 +845,7 @@ case BlackQuantum: case CMYKQuantum: case CMYKAQuantum: + case MultispectralQuantum: { image->type=ColorSeparationType; break; @@ -911,10 +923,10 @@ { assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(quantum_info != (QuantumInfo ) NULL); assert(quantum_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); quantum_info->pad=pad; return(SetQuantumDepth(image,quantum_info,quantum_info->depth)); } @@ -967,8 +979,7 @@ % % The format of the SetQuantumQuantum method is: % -% void SetQuantumQuantum(QuantumInfo quantum_info, -% const size_t quantum) +% void SetQuantumQuantum(QuantumInfo quantum_info,const size_t quantum) % % A description of each parameter follows: %
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/quantum.h ^
@@ -76,7 +76,8 @@ RGBOQuantum, RGBPadQuantum, RGBQuantum, - YellowQuantum + YellowQuantum, + MultispectralQuantum } QuantumType; typedef struct _QuantumInfo
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/random.c ^
@@ -63,6 +63,9 @@ #include "MagickCore/thread-private.h" #include "MagickCore/utility.h" #include "MagickCore/utility-private.h" +#if defined(MAGICKCORE_HAVE_GETENTROPY) +#include <sys/random.h> +#endif /* Define declarations. / @@ -273,9 +276,10 @@ / MagickExport RandomInfo DestroyRandomInfo(RandomInfo random_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(random_info != (RandomInfo ) NULL); assert(random_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); LockSemaphoreInfo(random_info->semaphore); if (random_info->reservoir != (StringInfo ) NULL) random_info->reservoir=DestroyStringInfo(random_info->reservoir); @@ -346,7 +350,7 @@ static StringInfo GenerateEntropicChaos(RandomInfo random_info) { -#define MaxEntropyExtent 64 +#define MaxEntropyExtent 64 /* max permitted: 256 / MagickThreadType tid; @@ -367,6 +371,20 @@ / entropy=AcquireStringInfo(0); LockSemaphoreInfo(random_info->semaphore); +#if defined(MAGICKCORE_HAVE_GETENTROPY) + { + int + status; + + SetStringInfoLength(entropy,MaxEntropyExtent); + status=getentropy(GetStringInfoDatum(entropy),MaxEntropyExtent); + if (status == 0) + { + UnlockSemaphoreInfo(random_info->semaphore); + return(entropy); + } + } +#endif chaos=AcquireStringInfo(sizeof(unsigned char )); SetStringInfoDatum(chaos,(unsigned char ) &entropy); ConcatenateStringInfo(entropy,chaos); @@ -413,7 +431,7 @@ if (gettimeofday(&timer,(struct timezone ) NULL) == 0) { seconds=(size_t) timer.tv_sec; - nanoseconds=((size_t) 1000ULtimer.tv_usec); + nanoseconds=(size_t) (1000UL*timer.tv_usec); } } #endif
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/resample.c ^
@@ -213,10 +213,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); resample_filter=(ResampleFilter ) AcquireCriticalMemory(sizeof( resample_filter)); (void) memset(resample_filter,0,sizeof(resample_filter)); @@ -265,7 +265,7 @@ assert(resample_filter != (ResampleFilter ) NULL); assert(resample_filter->signature == MagickCoreSignature); assert(resample_filter->image != (Image ) NULL); - if (resample_filter->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", resample_filter->image->filename); resample_filter->view=DestroyCacheView(resample_filter->view); @@ -1407,7 +1407,7 @@ assert(resample_filter != (ResampleFilter ) NULL); assert(resample_filter->signature == MagickCoreSignature); assert(resample_filter->image != (Image ) NULL); - if (resample_filter->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", resample_filter->image->filename); resample_filter->interpolate=method; @@ -1446,7 +1446,7 @@ assert(resample_filter != (ResampleFilter ) NULL); assert(resample_filter->signature == MagickCoreSignature); assert(resample_filter->image != (Image *) NULL); - if (resample_filter->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", resample_filter->image->filename); resample_filter->virtual_pixel=method;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/resize.c ^
@@ -927,11 +927,11 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(UndefinedFilter < filter && filter < SentinelFilter); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) exception; resize_filter=(ResizeFilter ) AcquireCriticalMemory(sizeof(resize_filter)); (void) memset(resize_filter,0,sizeof(resize_filter)); @@ -1732,10 +1732,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((columns == 0) \|\| (rows == 0)) ThrowImageException(ImageError,"NegativeOrZeroImageSize"); if ((columns == image->columns) && (rows == image->rows)) @@ -1907,10 +1907,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((columns == 0) \|\| (rows == 0)) ThrowImageException(ImageError,"NegativeOrZeroImageSize"); if ((columns == image->columns) && (rows == image->rows)) @@ -2024,10 +2024,10 @@ { assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, "DelegateLibrarySupportNotBuiltIn","'%s' (LQR)",image->filename); return((Image ) NULL); @@ -2876,10 +2876,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); option=GetImageOption(image->image_info,"magnify:method"); if (option == (char ) NULL) option="scale2x"; @@ -3111,10 +3111,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); minify_image=ResizeImage(image,image->columns/2,image->rows/2,SplineFilter, exception); return(minify_image); @@ -3171,10 +3171,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); width=(size_t) (x_resolutionimage->columns/(image->resolution.x == 0.0 ? DefaultResolution : image->resolution.x)+0.5); height=(size_t) (y_resolutionimage->rows/(image->resolution.y == 0.0 ? @@ -3745,10 +3745,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((columns == 0) \|\| (rows == 0)) ThrowImageException(ImageError,"NegativeOrZeroImageSize"); if ((columns == image->columns) && (rows == image->rows) && @@ -3893,10 +3893,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((columns == 0) \|\| (rows == 0)) ThrowImageException(ImageError,"NegativeOrZeroImageSize"); if ((columns == image->columns) && (rows == image->rows)) @@ -4108,10 +4108,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((columns == 0) \|\| (rows == 0)) ThrowImageException(ImageError,"NegativeOrZeroImageSize"); if ((columns == image->columns) && (rows == image->rows)) @@ -4533,49 +4533,56 @@ name; Image - clone_image, thumbnail_image; - ssize_t - x_factor, - y_factor; - struct stat attributes; assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); - x_factor=(ssize_t) image->columns/columns; - y_factor=(ssize_t) image->rows/rows; - clone_image=CloneImage(image,0,0,MagickTrue,exception); - if ((x_factor > 4) && (y_factor > 4)) + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); + thumbnail_image=CloneImage(image,0,0,MagickTrue,exception); + if (thumbnail_image == (Image ) NULL) + return(thumbnail_image); + if ((columns != image->columns) \|\| (rows != image->rows)) { - thumbnail_image=SampleImage(clone_image,4columns,4rows,exception); - if (thumbnail_image != (Image ) NULL) + Image + clone_image = thumbnail_image; + + ssize_t + x_factor, + y_factor; + + x_factor=(ssize_t) image->columns/columns; + y_factor=(ssize_t) image->rows/rows; + if ((x_factor > 4) && (y_factor > 4)) { - clone_image=DestroyImage(clone_image); - clone_image=thumbnail_image; + thumbnail_image=SampleImage(clone_image,4columns,4rows,exception); + if (thumbnail_image != (Image ) NULL) + { + clone_image=DestroyImage(clone_image); + clone_image=thumbnail_image; + } } - } - if ((x_factor > 2) && (y_factor > 2)) - { - thumbnail_image=ResizeImage(clone_image,2columns,2rows,BoxFilter, - exception); - if (thumbnail_image != (Image ) NULL) + if ((x_factor > 2) && (y_factor > 2)) { - clone_image=DestroyImage(clone_image); - clone_image=thumbnail_image; + thumbnail_image=ResizeImage(clone_image,2columns,2rows,BoxFilter, + exception); + if (thumbnail_image != (Image ) NULL) + { + clone_image=DestroyImage(clone_image); + clone_image=thumbnail_image;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/resource.c ^
@@ -374,7 +374,7 @@ } default: ; } - if (IsEventLogging() != MagickFalse) + if ((GetLogEventMask() & ResourceEvent) != 0) { char resource_current[MagickFormatExtent], @@ -578,7 +578,8 @@ datum; assert(path != (char ) NULL); - (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"..."); + if ((GetLogEventMask() & ResourceEvent) != 0) + (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"..."); if (random_info == (RandomInfo ) NULL) { if (resource_semaphore[FileResource] == (SemaphoreInfo ) NULL) @@ -634,7 +635,8 @@ if ((file >= 0) \|\| (errno != EEXIST)) break; } - (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"%s",path); + if ((GetLogEventMask() & ResourceEvent) != 0) + (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"%s",path); if (file == -1) return(file); if (resource_semaphore[FileResource] == (SemaphoreInfo ) NULL) @@ -1054,7 +1056,7 @@ } default: ; } - if (IsEventLogging() != MagickFalse) + if ((GetLogEventMask() & ResourceEvent) != 0) { char resource_current[MagickFormatExtent], @@ -1105,7 +1107,8 @@ assert(path != (const char ) NULL); status=MagickFalse; - (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"%s",path); + if ((GetLogEventMask() & ResourceEvent) != 0) + (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"%s",path); if (resource_semaphore[FileResource] == (SemaphoreInfo *) NULL) ActivateSemaphoreInfo(&resource_semaphore[FileResource]); LockSemaphoreInfo(resource_semaphore[FileResource]);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/segment.c ^
@@ -973,7 +973,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); GetPixelInfo(image,pixel); for (i=0; i < MaxDimension; i++) @@ -1817,7 +1817,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); for (i=0; i < MaxDimension; i++) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/shear.c ^
@@ -141,7 +141,7 @@ extent[2].y=(double) height/2.0; extent[3].x=(double) width/2.0; extent[3].y=(double) height/2.0; - for (i=0; i < 4; i++) + for (i=3; i >= 0; i--) { extent[i].x+=x_shearextent[i].y; extent[i].y+=y_shearextent[i].x; @@ -1165,7 +1165,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; background=image->background_color; @@ -1382,7 +1382,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; progress=0; @@ -1591,10 +1591,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((x_shear != 0.0) && (fmod(x_shear,90.0) == 0.0)) ThrowImageException(ImageError,"AngleIsDiscontinuous"); if ((y_shear != 0.0) && (fmod(y_shear,90.0) == 0.0)) @@ -1736,10 +1736,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); angle=fmod(degrees,360.0); if (angle < -45.0) angle+=360.0;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/signature.c ^
@@ -170,9 +170,10 @@ / MagickPrivate SignatureInfo DestroySignatureInfo(SignatureInfo signature_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(signature_info != (SignatureInfo ) NULL); assert(signature_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (signature_info->accumulator != (unsigned int ) NULL) signature_info->accumulator=(unsigned int ) RelinquishMagickMemory( signature_info->accumulator); @@ -231,9 +232,10 @@ /* Add padding and return the message accumulator. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(signature_info != (SignatureInfo ) NULL); assert(signature_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); low_order=signature_info->low_order; high_order=signature_info->high_order; extent=((low_order >> 3) & 0x3f); @@ -296,9 +298,10 @@ MagickPrivate unsigned int GetSignatureBlocksize( const SignatureInfo signature_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(signature_info != (SignatureInfo ) NULL); assert(signature_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(signature_info->blocksize); } @@ -327,9 +330,10 @@ MagickPrivate const StringInfo GetSignatureDigest( const SignatureInfo signature_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(signature_info != (SignatureInfo ) NULL); assert(signature_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(signature_info->digest); } @@ -358,9 +362,10 @@ MagickPrivate unsigned int GetSignatureDigestsize( const SignatureInfo signature_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(signature_info != (SignatureInfo ) NULL); assert(signature_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(signature_info->digestsize); } @@ -388,9 +393,10 @@ / MagickPrivate void InitializeSignature(SignatureInfo signature_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(signature_info != (SignatureInfo ) NULL); assert(signature_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); signature_info->accumulator[0]=0x6a09e667U; signature_info->accumulator[1]=0xbb67ae85U; signature_info->accumulator[2]=0x3c6ef372U; @@ -499,7 +505,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); signature_info=AcquireSignatureInfo(); signature=AcquireStringInfo(GetPixelChannels(image)image->columns
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/splay-tree.c ^
@@ -316,7 +316,7 @@ % The format of the CloneSplayTree method is: % % SplayTreeInfo CloneSplayTree(SplayTreeInfo splay_tree, -% void (clone_key)(void ),void (cline_value)(void )) +% void (clone_key)(void ),void (clone_value)(void )) % % A description of each parameter follows: % @@ -355,7 +355,7 @@ assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); clone_tree=NewSplayTree(splay_tree->compare,splay_tree->relinquish_key, splay_tree->relinquish_value); @@ -492,7 +492,7 @@ assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); LockSemaphoreInfo(splay_tree->semaphore); if (splay_tree->root == (NodeInfo ) NULL) @@ -612,7 +612,7 @@ assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (splay_tree->root == (NodeInfo ) NULL) return(MagickFalse); @@ -776,7 +776,7 @@ assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if ((splay_tree->root == (NodeInfo ) NULL) \|\| (splay_tree->next == (void ) NULL)) @@ -830,7 +830,7 @@ assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if ((splay_tree->root == (NodeInfo ) NULL) \|\| (splay_tree->next == (void ) NULL)) @@ -881,7 +881,7 @@ assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); value=(const void ) NULL; LockSemaphoreInfo(splay_tree->semaphore); @@ -929,7 +929,7 @@ assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (splay_tree->root == (NodeInfo ) NULL) return((void ) NULL); @@ -978,7 +978,7 @@ { assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(splay_tree->nodes); } @@ -1199,7 +1199,7 @@ assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); key=(void ) NULL; if (splay_tree->root == (NodeInfo ) NULL) @@ -1311,7 +1311,7 @@ assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); value=(void ) NULL; if (splay_tree->root == (NodeInfo ) NULL) @@ -1388,7 +1388,7 @@ assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); LockSemaphoreInfo(splay_tree->semaphore); if (splay_tree->root != (NodeInfo ) NULL) @@ -1473,7 +1473,7 @@ { assert(splay_tree != (SplayTreeInfo ) NULL); assert(splay_tree->signature == MagickCoreSignature); - if (splay_tree->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); LockSemaphoreInfo(splay_tree->semaphore); splay_tree->next=GetFirstSplayTreeNode(splay_tree);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/static.c ^
@@ -133,7 +133,7 @@ assert(image != (Image *) NULL); assert((image)->signature == MagickCoreSignature); - if ((image)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(image)->filename); rights=ReadPolicyRights; if (IsRightsAuthorized(FilterPolicyDomain,rights,tag) == MagickFalse) @@ -168,12 +168,12 @@ signature; if ((image)->debug != MagickFalse) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), + (void) LogMagickEvent(TransformEvent,GetMagickModule(), "Invoking \"%s\" static image filter",tag); signature=image_filter(image,argc,argv,exception); if ((image)->debug != MagickFalse) - (void) LogMagickEvent(CoderEvent,GetMagickModule(),"\"%s\" completes", - tag); + (void) LogMagickEvent(TransformEvent,GetMagickModule(), + "\"%s\" completes",tag); if (signature != MagickImageFilterSignature) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/static.h ^
@@ -75,6 +75,7 @@ RegisterFL32Image(void), RegisterFLIFImage(void), RegisterFPXImage(void), + RegisterFTXTImage(void), RegisterG3Image(void), RegisterGIFImage(void), RegisterGIF87Image(void), @@ -149,6 +150,7 @@ RegisterPSDImage(void), RegisterPTIFImage(void), RegisterPWPImage(void), + RegisterQOIImage(void), RegisterRASImage(void), RegisterRAWImage(void), RegisterRGBImage(void), @@ -164,6 +166,7 @@ RegisterSHTMLImage(void), RegisterSIXELImage(void), RegisterSTEGANOImage(void), + RegisterSTRIMGImage(void), RegisterSUNImage(void), RegisterSVGImage(void), RegisterTEXTImage(void), @@ -245,6 +248,7 @@ UnregisterFL32Image(void), UnregisterFLIFImage(void), UnregisterFPXImage(void), + UnregisterFTXTImage(void), UnregisterG3Image(void), UnregisterGIFImage(void), UnregisterGIF87Image(void), @@ -320,6 +324,7 @@ UnregisterPSDImage(void), UnregisterPTIFImage(void), UnregisterPWPImage(void), + UnregisterQOIImage(void), UnregisterRASImage(void), UnregisterRAWImage(void), UnregisterRGBImage(void), @@ -335,6 +340,7 @@ UnregisterSHTMLImage(void), UnregisterSIXELImage(void), UnregisterSTEGANOImage(void), + UnregisterSTRIMGImage(void), UnregisterSUNImage(void), UnregisterSVGImage(void), UnregisterTEXTImage(void),
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/statistic.c ^
@@ -512,10 +512,10 @@ assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); image=AcquireImageCanvas(images,exception); if (image == (Image ) NULL) return((Image ) NULL); @@ -855,10 +855,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); status=MagickTrue; @@ -1091,10 +1091,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); #if defined(MAGICKCORE_OPENCL_SUPPORT) if (AccelerateFunctionImage(image,function,number_parameters,parameters, exception) != MagickFalse) @@ -1198,7 +1198,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); channel_statistics=GetImageStatistics(image,exception); if (channel_statistics == (ChannelStatistics ) NULL) @@ -1250,7 +1250,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=GetImageRange(image,&min,&max,exception); minima=(size_t) ceil(min-0.5); @@ -1296,7 +1296,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); channel_statistics=GetImageStatistics(image,exception); if (channel_statistics == (ChannelStatistics ) NULL) @@ -1346,7 +1346,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); channel_statistics=GetImageStatistics(image,exception); if (channel_statistics == (ChannelStatistics ) NULL) @@ -1394,7 +1394,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); channel_statistics=GetImageStatistics(image,exception); if (channel_statistics == (ChannelStatistics ) NULL) @@ -1444,20 +1444,20 @@ double channels, - M00[MaxPixelChannels+1], - M01[MaxPixelChannels+1], - M02[MaxPixelChannels+1], - M03[MaxPixelChannels+1], - M10[MaxPixelChannels+1], - M11[MaxPixelChannels+1], - M12[MaxPixelChannels+1], - M20[MaxPixelChannels+1], - M21[MaxPixelChannels+1], - M22[MaxPixelChannels+1], - M30[MaxPixelChannels+1]; + M00[2MaxPixelChannels+1], + M01[2MaxPixelChannels+1], + M02[2MaxPixelChannels+1], + M03[2MaxPixelChannels+1], + M10[2MaxPixelChannels+1], + M11[2MaxPixelChannels+1], + M12[2MaxPixelChannels+1], + M20[2MaxPixelChannels+1], + M21[2MaxPixelChannels+1], + M22[2MaxPixelChannels+1], + M30[2MaxPixelChannels+1]; PointInfo - centroid[MaxPixelChannels+1]; + centroid[2MaxPixelChannels+1]; ssize_t c, @@ -1465,7 +1465,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); channel_moments=(ChannelMoments ) AcquireQuantumMemory(MaxPixelChannels+1, sizeof(channel_moments)); @@ -1854,7 +1854,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; initialize=MagickTrue; @@ -2059,7 +2059,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); histogram=(double ) AcquireQuantumMemory(MaxMap+1UL,GetPixelChannels(image)* sizeof(histogram)); @@ -2363,7 +2363,7 @@ assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); @@ -2865,7 +2865,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/stream.c ^
@@ -17,7 +17,7 @@ % March 2000 % % % % % -% Copyright @ 2000 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -224,7 +224,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); cache_info=(CacheInfo ) image->cache; assert(cache_info->signature == MagickCoreSignature); @@ -272,9 +272,10 @@ / MagickExport StreamInfo DestroyStreamInfo(StreamInfo stream_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(stream_info != (StreamInfo ) NULL); assert(stream_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (stream_info->map != (char ) NULL) stream_info->map=DestroyString(stream_info->map); if (stream_info->pixels != (unsigned char ) NULL) @@ -323,7 +324,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); cache_info=(CacheInfo ) image->cache; assert(cache_info->signature == MagickCoreSignature); @@ -371,7 +372,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); pixels=QueueAuthenticPixelsStream(image,x,y,columns,rows,exception); return(pixels); @@ -407,7 +408,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); cache_info=(CacheInfo ) image->cache; assert(cache_info->signature == MagickCoreSignature); @@ -601,7 +602,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); cache_info=(CacheInfo ) image->cache; assert(cache_info->signature == MagickCoreSignature); @@ -639,7 +640,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); cache_info=(CacheInfo ) image->cache; assert(cache_info->signature == MagickCoreSignature); @@ -760,7 +761,7 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((x < 0) \|\| (y < 0) \|\| ((x+(ssize_t) columns) > (ssize_t) image->columns) \|\| @@ -1056,11 +1057,11 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); read_info=CloneImageInfo(image_info); read_info->cache=AcquirePixelCache(0); GetPixelCacheMethods(&cache_methods); @@ -1344,12 +1345,12 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(stream_info != (StreamInfo ) NULL); assert(stream_info->signature == MagickCoreSignature); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); read_info=CloneImageInfo(image_info); stream_info->image_info=image_info; stream_info->quantum_info=AcquireQuantumInfo(image_info,(Image ) NULL); @@ -1421,7 +1422,7 @@ assert(stream_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); length=strlen(stream_info->map); quantum_map=(QuantumType ) AcquireQuantumMemory(length,sizeof(quantum_map)); @@ -2794,7 +2795,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); cache_info=(CacheInfo ) image->cache; assert(cache_info->signature == MagickCoreSignature); @@ -2848,7 +2849,7 @@ assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); assert(image != (Image *) NULL);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/string.c ^
@@ -17,7 +17,7 @@ % August 2003 % % % % % -% Copyright @ 2003 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the license. You may % @@ -969,8 +969,9 @@ length; assert(filename != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); return((char ) FileToBlob(filename,extent,&length,exception)); } @@ -1008,8 +1009,9 @@ string_info; assert(filename != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); string_info=AcquireStringInfoContainer(); string_info->path=ConstantString(filename); string_info->datum=(unsigned char *) FileToBlob(filename,extent,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/threshold.c ^
@@ -209,10 +209,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); threshold_image=CloneImage(image,0,0,MagickTrue,exception); if (threshold_image == (Image ) NULL) return((Image ) NULL); @@ -687,7 +687,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); histogram=(double ) AcquireQuantumMemory(MaxIntensity+1UL, sizeof(histogram)); @@ -822,7 +822,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); @@ -953,7 +953,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (thresholds == (const char ) NULL) return(MagickTrue); @@ -1103,7 +1103,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) { @@ -1248,7 +1248,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=AcquireImageColormap(image,2,exception); if (status == MagickFalse) @@ -1918,10 +1918,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (threshold_map == (const char ) NULL) return(MagickTrue); p=(char ) threshold_map; @@ -2103,7 +2103,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) { @@ -2247,10 +2247,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); /* @@ -2386,7 +2386,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); @@ -2534,7 +2534,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (thresholds == (const char *) NULL) return(MagickTrue);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/token.c ^
@@ -129,9 +129,10 @@ / MagickExport TokenInfo DestroyTokenInfo(TokenInfo token_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(token_info != (TokenInfo ) NULL); assert(token_info->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); token_info->signature=(~MagickCoreSignature); token_info=(TokenInfo *) RelinquishMagickMemory(token_info); return(token_info);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/transform.c ^
@@ -41,6 +41,7 @@ / #include "MagickCore/studio.h" #include "MagickCore/attribute.h" +#include "MagickCore/artifact.h" #include "MagickCore/cache.h" #include "MagickCore/cache-view.h" #include "MagickCore/color.h" @@ -216,11 +217,11 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); assert(chop_info != (RectangleInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (((chop_info->x+(ssize_t) chop_info->width) < 0) \|\| ((chop_info->y+(ssize_t) chop_info->height) < 0) \|\| (chop_info->x > (ssize_t) image->columns) \|\| @@ -435,10 +436,10 @@ / assert(images != (Image ) NULL); assert(images->signature == MagickCoreSignature); - if (images->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename); cmyk_images=NewImageList(); for (j=0; j < (ssize_t) GetImageListLength(images); j+=4) { @@ -567,11 +568,11 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(geometry != (const RectangleInfo ) NULL); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); bounding_box=image->page; if ((bounding_box.width == 0) \|\| (bounding_box.height == 0)) { @@ -794,7 +795,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); flags=ParseGravityGeometry(image,crop_geometry,&geometry,exception); if ((flags & AreaValue) != 0) @@ -1004,11 +1005,11 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(geometry != (const RectangleInfo ) NULL); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); excerpt_image=CloneImage(image,geometry->width,geometry->height,MagickTrue, exception); if (excerpt_image == (Image ) NULL) @@ -1132,11 +1133,11 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(geometry != (const RectangleInfo ) NULL); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); extent_image=CloneImage(image,geometry->width,geometry->height,MagickTrue, exception); if (extent_image == (Image ) NULL) @@ -1204,10 +1205,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); flip_image=CloneImage(image,0,0,MagickTrue,exception); if (flip_image == (Image ) NULL) return((Image ) NULL); @@ -1339,10 +1340,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); flop_image=CloneImage(image,0,0,MagickTrue,exception); if (flop_image == (Image ) NULL) return((Image ) NULL); @@ -1550,10 +1551,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); roll_image=CloneImage(image,0,0,MagickTrue,exception); if (roll_image == (Image ) NULL) return((Image ) NULL); @@ -1635,7 +1636,7 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (((2shave_info->width) >= image->columns) \|\| ((2shave_info->height) >= image->rows)) @@ -1714,7 +1715,7 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(geometry != (const RectangleInfo ) NULL); assert(exception != (ExceptionInfo ) NULL); @@ -2045,7 +2046,7 @@ assert(image != (Image ) NULL); assert((image)->signature == MagickCoreSignature); - if ((image)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(image)->filename); transform_image=(image); if (crop_geometry != (const char ) NULL) @@ -2136,10 +2137,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); transpose_image=CloneImage(image,image->rows,image->columns,MagickTrue, exception); if (transpose_image == (Image ) NULL) @@ -2274,10 +2275,10 @@ assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); transverse_image=CloneImage(image,image->rows,image->columns,MagickTrue, exception); if (transverse_image == (Image ) NULL) @@ -2398,15 +2399,19 @@ / MagickExport Image TrimImage(const Image image,ExceptionInfo exception) { + const char + artifact; + Image trim_image; RectangleInfo - geometry; + geometry, + page; assert(image != (const Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); geometry=GetImageBoundingBox(image,exception); if ((geometry.width == 0) \|\| (geometry.height == 0))
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/type.c ^
@@ -190,11 +190,17 @@ static SplayTreeInfo AcquireTypeCache(const char filename, ExceptionInfo exception) { + MagickStatusType + status; + SplayTreeInfo cache; cache=NewSplayTree(CompareSplayTreeString,(void ()(void )) NULL, DestroyTypeNode); + if (cache == (SplayTreeInfo ) NULL) + ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); + status=MagickTrue; #if !MAGICKCORE_ZERO_CONFIGURATION_SUPPORT { char @@ -213,7 +219,7 @@ while (option != (const StringInfo ) NULL) { (void) CopyMagickString(path,GetStringInfoPath(option),MagickPathExtent); - (void) LoadTypeCache(cache,(const char ) + status&=LoadTypeCache(cache,(const char ) GetStringInfoDatum(option),GetStringInfoPath(option),0,exception); option=(const StringInfo ) GetNextValueInLinkedList(options); } @@ -232,7 +238,7 @@ xml=FileToString(path,~0UL,exception); if (xml != (void ) NULL) { - (void) LoadTypeCache(cache,xml,path,0,exception); + status&=LoadTypeCache(cache,xml,path,0,exception); xml=DestroyString(xml); } font_path=DestroyString(font_path); @@ -242,7 +248,9 @@ magick_unreferenced(filename); #endif if (GetNumberOfNodesInSplayTree(cache) == 0) - (void) LoadTypeCache(cache,TypeMap,"built-in",0,exception); + status&=LoadTypeCache(cache,TypeMap,"built-in",0,exception); + if (status == MagickFalse) + ; return(cache); } @@ -563,8 +571,9 @@ Allocate type list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_fonts != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_fonts=0; p=GetTypeInfo("",exception); if (p == (const TypeInfo ) NULL) @@ -656,8 +665,9 @@ Allocate type list. / assert(pattern != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); assert(number_fonts != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",pattern); number_fonts=0; p=GetTypeInfo("",exception); if (p == (const TypeInfo ) NULL) @@ -1084,8 +1094,9 @@ / Load the type map file. / - (void) LogMagickEvent(ConfigureEvent,GetMagickModule(), - "Loading type configure file \"%s\" ...",filename); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(ConfigureEvent,GetMagickModule(), + "Loading type configure file \"%s\" ...",filename); if (xml == (const char ) NULL) return(MagickFalse); status=MagickTrue;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/utility-private.h ^
@@ -346,23 +346,23 @@ if (handle != (HANDLE) NULL) { FILETIME - creationTime, - lastAccessTime, - lastWriteTime; + creation_time, + last_access_time, + last_write_time; - LONGLONG - dateTime; + ULARGE_INTEGER + date_time; - dateTime=Int32x32To64(attributes->st_ctime,10000000)+116444736000000000; - creationTime.dwLowDateTime=(DWORD) dateTime; - creationTime.dwHighDateTime=dateTime>>32; - dateTime=Int32x32To64(attributes->st_atime,10000000)+116444736000000000; - lastAccessTime.dwLowDateTime=(DWORD) dateTime; - lastAccessTime.dwHighDateTime=dateTime>>32; - dateTime=Int32x32To64(attributes->st_mtime,10000000)+116444736000000000; - lastWriteTime.dwLowDateTime=(DWORD) dateTime; - lastWriteTime.dwHighDateTime=dateTime>>32; - status=SetFileTime(handle,&creationTime,&lastAccessTime,&lastWriteTime); + date_time.QuadPart=(attributes->st_ctime10000000LL)+116444736000000000LL; + creation_time.dwLowDateTime=date_time.LowPart; + creation_time.dwHighDateTime=date_time.HighPart; + date_time.QuadPart=(attributes->st_atime10000000LL)+116444736000000000LL; + last_access_time.dwLowDateTime=date_time.LowPart; + last_access_time.dwHighDateTime=date_time.HighPart; + date_time.QuadPart=(attributes->st_mtime*10000000LL)+116444736000000000LL; + last_write_time.dwLowDateTime=date_time.LowPart; + last_write_time.dwHighDateTime=date_time.HighPart; + status=SetFileTime(handle,&creation_time,&last_access_time,&last_write_time); CloseHandle(handle); status=0; }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/utility.c ^
@@ -286,7 +286,8 @@ assert(format != (char ) NULL); assert(filename != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); if ((format == '\0') \|\| (filename == '\0')) return; if (LocaleCompare(filename,"-") == 0) @@ -358,9 +359,10 @@ unsigned char decode; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(source != (char ) NULL); assert(length != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); length=0; decode=(unsigned char ) AcquireQuantumMemory((strlen(source)+3)/4, 3sizeof(decode)); @@ -513,10 +515,11 @@ size_t remainder; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(blob != (const unsigned char ) NULL); assert(blob_length != 0); assert(encode_length != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); encode_length=0; encode=(char ) AcquireQuantumMemory(blob_length/3+4,4sizeof(encode)); if (encode == (char ) NULL) @@ -763,9 +766,10 @@ /* Allocate argument vector. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(number_arguments != (int ) NULL); assert(arguments != (char *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); vector=(char ) AcquireQuantumMemory((size_t) (number_arguments+1), sizeof(vector)); if (vector == (char *) NULL) @@ -1233,8 +1237,9 @@ subimage_length; assert(path != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",path); assert(component != (char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",path); if (path == '\0') { component='\0'; @@ -1626,9 +1631,10 @@ Open directory. / assert(directory != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",directory); assert(pattern != (const char ) NULL); assert(number_entries != (size_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",directory); number_entries=0; current_directory=opendir(directory); if (current_directory == (DIR *) NULL)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/version.c ^
@@ -17,7 +17,7 @@ % September 2002 % % % % % -% Copyright @ 2002 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may %
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/version.h.in ^
@@ -39,6 +39,7 @@ #define MagickppLibAddendum "@PACKAGE_VERSION_ADDENDUM@" #define MagickppLibInterface @MAGICKPP_LIBRARY_CURRENT@ #define MagickppLibMinInterface @MAGICKPP_LIBRARY_CURRENT_MIN@ +#define MagickGitRevision "@MAGICK_GIT_REVISION@" #define MagickReleaseDate "@PACKAGE_RELEASE_DATE@" #define MagickAuthoritativeLicense \ "https://imagemagick.org/script/license.php" @@ -68,7 +69,7 @@ #define MagickVersion \ MagickPackageName " " MagickLibVersionText MagickLibAddendum " " \ MagickQuantumDepth MagickHDRISupport " " MagickPlatform " " \ - MagickReleaseDate " " MagickAuthoritativeURL + MagickGitRevision " " MagickAuthoritativeURL extern MagickExport char *GetMagickHomeURL(void);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/vision.c ^
@@ -124,6 +124,26 @@ p=(CCObjectInfo ) x; q=(CCObjectInfo ) y; + if (p->key == -5) + return((int) (q->bounding_box.y-(ssize_t) p->bounding_box.y)); + if (p->key == -4) + return((int) (q->bounding_box.x-(ssize_t) p->bounding_box.x)); + if (p->key == -3) + return((int) (q->bounding_box.height-(ssize_t) p->bounding_box.height)); + if (p->key == -2) + return((int) (q->bounding_box.width-(ssize_t) p->bounding_box.width)); + if (p->key == -1) + return((int) (q->area-(ssize_t) p->area)); + if (p->key == 1) + return((int) (p->area-(ssize_t) q->area)); + if (p->key == 2) + return((int) (p->bounding_box.width-(ssize_t) q->bounding_box.width)); + if (p->key == 3) + return((int) (p->bounding_box.height-(ssize_t) q->bounding_box.height)); + if (p->key == 4) + return((int) (p->bounding_box.x-(ssize_t) q->bounding_box.x)); + if (p->key == 5) + return((int) (p->bounding_box.y-(ssize_t) q->bounding_box.y)); return((int) (q->area-(ssize_t) p->area)); } @@ -170,8 +190,6 @@ ssize_t x; - if (status == MagickFalse) - continue; p=GetCacheViewVirtualPixels(component_view,bounding_box.x-1, bounding_box.y+y,bounding_box.width+2,2,exception); if (p == (const Quantum ) NULL) @@ -281,8 +299,6 @@ ssize_t x; - if (status == MagickFalse) - continue; p=GetCacheViewVirtualPixels(component_view,bounding_box.x-1, bounding_box.y+y,bounding_box.width+2,2,exception); if (p == (const Quantum ) NULL) @@ -402,8 +418,6 @@ bounding_box=object[i].bounding_box; for (y=0; y < (ssize_t) bounding_box.height; y++) { - if (status == MagickFalse) - continue; p=GetCacheViewVirtualPixels(component_view,bounding_box.x, bounding_box.y+y,bounding_box.width,1,exception); if (p == (const Quantum ) NULL) @@ -447,8 +461,8 @@ } } component_view=DestroyCacheView(component_view); - object[i].metric[metric_index]=sqrt((2.0PerceptibleReciprocal(M00))((M20+M02)+ - sqrt(4.0M11M11+(M20-M02)(M20-M02)))); + object[i].metric[metric_index]=sqrt((2.0PerceptibleReciprocal(M00)) + ((M20+M02)+sqrt(4.0M11M11+(M20-M02)(M20-M02)))); } } @@ -503,8 +517,6 @@ bounding_box=object[i].bounding_box; for (y=0; y < (ssize_t) bounding_box.height; y++) { - if (status == MagickFalse) - continue; p=GetCacheViewVirtualPixels(component_view,bounding_box.x, bounding_box.y+y,bounding_box.width,1,exception); if (p == (const Quantum ) NULL) @@ -548,8 +560,8 @@ } } component_view=DestroyCacheView(component_view); - object[i].metric[metric_index]=sqrt((2.0PerceptibleReciprocal(M00))((M20+M02)- - sqrt(4.0M11M11+(M20-M02)(M20-M02)))); + object[i].metric[metric_index]=sqrt((2.0PerceptibleReciprocal(M00))* + ((M20+M02)-sqrt(4.0M11M11+(M20-M02)(M20-M02)))); } } @@ -605,8 +617,6 @@ bounding_box=object[i].bounding_box; for (y=0; y < (ssize_t) bounding_box.height; y++) { - if (status == MagickFalse) - continue; p=GetCacheViewVirtualPixels(component_view,bounding_box.x, bounding_box.y+y,bounding_box.width,1,exception); if (p == (const Quantum ) NULL) @@ -710,8 +720,6 @@ bounding_box=object[i].bounding_box; for (y=0; y < (ssize_t) bounding_box.height; y++) { - if (status == MagickFalse) - continue; p=GetCacheViewVirtualPixels(component_view,bounding_box.x, bounding_box.y+y,bounding_box.width,1,exception); if (p == (const Quantum ) NULL) @@ -815,9 +823,6 @@ MatrixInfo equivalences; - ssize_t - i; - size_t size; @@ -828,6 +833,7 @@ dx, dy, first, + i, last, n, step, @@ -838,10 +844,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (objects != (CCObjectInfo ) NULL) objects=(CCObjectInfo ) NULL; component_image=CloneImage(image,0,0,MagickTrue,exception); @@ -1423,7 +1429,7 @@ } for (x=0; x < (ssize_t) bounding_box.width; x++) { - size_t + ssize_t k; if (status == MagickFalse) @@ -1507,6 +1513,10 @@ if ((IsStringTrue(artifact) != MagickFalse) \|\| (objects != (CCObjectInfo ) NULL)) { + ssize_t + key, + order; + / Report statistics on each unique object. / @@ -1567,6 +1577,28 @@ object[i].centroid.y=object[i].centroid.y/object[i].area; } component_view=DestroyCacheView(component_view); + order=1; + artifact=GetImageArtifact(image,"connected-components:sort-order"); + if (artifact != (const char ) NULL) + if (LocaleCompare(artifact,"decreasing") == 0) + order=(-1); + key=0; + artifact=GetImageArtifact(image,"connected-components:sort"); + if (artifact != (const char ) NULL) + { + if (LocaleCompare(artifact,"area") == 0) + key=1; + if (LocaleCompare(artifact,"width") == 0) + key=2; + if (LocaleCompare(artifact,"height") == 0) + key=3; + if (LocaleCompare(artifact,"x") == 0) + key=4; + if (LocaleCompare(artifact,"y") == 0) + key=5; + } + for (i=0; i < (ssize_t) component_image->colors; i++) + object[i].key=orderkey; qsort((void ) object,component_image->colors,sizeof(object), CCObjectInfoCompare); if (objects == (CCObjectInfo *) NULL) @@ -1670,10 +1702,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); integral_image=CloneImage(image,0,0,MagickTrue,exception); if (integral_image == (Image ) NULL) return((Image ) NULL);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/vision.h ^
@@ -47,6 +47,9 @@ double metric[CCMaxMetrics]; + + ssize_t + key; } CCObjectInfo; extern MagickExport Image
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/visual-effects.c ^
@@ -168,10 +168,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); #if defined(MAGICKCORE_OPENCL_SUPPORT) noise_image=AccelerateAddNoiseImage(image,noise_type,attenuate,exception); if (noise_image != (Image ) NULL) @@ -329,10 +329,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); shift_image=CloneImage(image,0,0,MagickTrue,exception); if (shift_image == (Image ) NULL) return((Image ) NULL); @@ -473,10 +473,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); edge_image=EdgeImage(image,radius,exception); if (edge_image == (Image ) NULL) return((Image ) NULL); @@ -567,10 +567,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); colorize_image=CloneImage(image,0,0,MagickTrue,exception); if (colorize_image == (Image ) NULL) return((Image ) NULL); @@ -760,10 +760,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); i=0; for (v=0; v < (ssize_t) color_matrix->height; v++) for (u=0; u < (ssize_t) color_matrix->width; u++) @@ -974,10 +974,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); canvas_image=CloneImage(image,0,0,MagickTrue,exception); if (canvas_image == (Image ) NULL) return((Image ) NULL); @@ -1186,10 +1186,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); morph_images=CloneImage(image,0,0,MagickTrue,exception); if (morph_images == (Image ) NULL) return((Image ) NULL); @@ -1625,10 +1625,8 @@ random_info; assert(image != (Image ) NULL); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); @@ -1703,10 +1701,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); quantum=(ssize_t) MagickMax(MagickMax((double) image->columns,(double) image->rows)/25.0,10.0); height=image->rows+2quantum; @@ -1893,10 +1891,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); sepia_image=CloneImage(image,0,0,MagickTrue,exception); if (sepia_image == (Image ) NULL) return((Image ) NULL); @@ -2051,10 +2049,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); clone_image=CloneImage(image,0,0,MagickTrue,exception); if (clone_image == (Image ) NULL) return((Image ) NULL); @@ -2347,7 +2345,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (IsGrayColorspace(image->colorspace) != MagickFalse) (void) SetImageColorspace(image,sRGBColorspace,exception); @@ -2506,12 +2504,12 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(watermark != (const Image ) NULL); assert(watermark->signature == MagickCoreSignature); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); one=1UL; stegano_image=CloneImage(image,0,0,MagickTrue,exception); if (stegano_image == (Image ) NULL) @@ -2668,13 +2666,13 @@ assert(left_image != (const Image ) NULL); assert(left_image->signature == MagickCoreSignature); - if (left_image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - left_image->filename); assert(right_image != (const Image ) NULL); assert(right_image->signature == MagickCoreSignature); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + left_image->filename); image=left_image; if ((left_image->columns != right_image->columns) \|\| (left_image->rows != right_image->rows)) @@ -2811,10 +2809,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); canvas_image=CloneImage(image,0,0,MagickTrue,exception); if (canvas_image == (Image ) NULL) return((Image ) NULL); @@ -3029,10 +3027,10 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/vms.c ^
@@ -72,7 +72,7 @@ / void closedir(DIR directory) { - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(directory != (DIR *) NULL); directory->pattern=DestroyString(directory->pattern);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/widget.c ^
@@ -1686,7 +1686,8 @@ assert(windows != (XWindows ) NULL); assert(action != (char ) NULL); assert(reply != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action); XSetCursorState(display,windows,MagickTrue); XCheckRefreshWindows(display,windows); (void) CopyMagickString(reset_pattern,"",MagickPathExtent); @@ -2911,9 +2912,10 @@ XFontStruct font_info; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(windows != (XWindows ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); font_info=windows->command.font_info; height=(unsigned int) (font_info->ascent+font_info->descent); id=(~0); @@ -3271,7 +3273,8 @@ assert(windows != (XWindows ) NULL); assert(reason != (char ) NULL); assert(description != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",reason); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",reason); XCheckRefreshWindows(display,windows); font_info=windows->widget.font_info; width=WidgetTextWidth(font_info,CancelButtonText); @@ -3688,7 +3691,8 @@ assert(action != (char ) NULL); assert(query != (char ) NULL); assert(reply != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action); XCheckRefreshWindows(display,windows); font_info=windows->widget.font_info; width=WidgetTextWidth(font_info,(char ) action); @@ -4291,7 +4295,8 @@ assert(windows != (XWindows ) NULL); assert(action != (char ) NULL); assert(reply != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action); XSetCursorState(display,windows,MagickTrue); XCheckRefreshWindows(display,windows); directory=getcwd(home_directory,MagickPathExtent); @@ -5482,7 +5487,7 @@ back_pattern[MagickPathExtent], fontlist, listhead, - primary_selection[MagickPathExtent], + primary_selection[MagickPathExtent] = "", reset_pattern[MagickPathExtent], text[MagickPathExtent]; @@ -5548,7 +5553,8 @@ assert(windows != (XWindows ) NULL); assert(action != (char ) NULL); assert(reply != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action); XSetCursorState(display,windows,MagickTrue); XCheckRefreshWindows(display,windows); (void) CopyMagickString(back_pattern,glob_pattern,MagickPathExtent); @@ -6665,7 +6671,8 @@ /* Map Info widget. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(windows != (XWindows ) NULL); assert(activity != (char ) NULL); @@ -6816,7 +6823,8 @@ assert(action != (char ) NULL); assert(query != (char ) NULL); assert(reply != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action); XSetCursorState(display,windows,MagickTrue); XCheckRefreshWindows(display,windows); if (list == (const char ) NULL) @@ -7708,7 +7716,8 @@ assert(title != (char ) NULL); assert(selections != (const char *) NULL); assert(item != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",title); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",title); font_info=windows->widget.font_info; windows->widget.width=submenu_info.active == 0 ? WidgetTextWidth(font_info,(char ) title) : 0; @@ -8145,7 +8154,8 @@ assert(display != (Display ) NULL); assert(windows != (XWindows ) NULL); assert(reason != (char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",reason); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",reason); XDelay(display,SuspendTime << 3); /* avoid surpise with delay / XSetCursorState(display,windows,MagickTrue); XCheckRefreshWindows(display,windows); @@ -8490,7 +8500,8 @@ / Determine Preferences widget attributes. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(resource_info != (XResourceInfo ) NULL); assert(windows != (XWindows ) NULL); @@ -8899,7 +8910,8 @@ assert(display != (Display ) NULL); assert(windows != (XWindows ) NULL); assert(task != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",task); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",task); if (span == 0) return; / @@ -9026,7 +9038,8 @@ assert(windows != (XWindows ) NULL); assert(title != (const char ) NULL); assert(textlist != (const char ) NULL); - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",title); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",title); XSetCursorState(display,windows,MagickTrue); XCheckRefreshWindows(display,windows); if (textlist == (const char ) NULL)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/xml-tree.c ^
@@ -23,7 +23,7 @@ % December 2004 % % % % % -% Copyright @ 2004 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -236,7 +236,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); node=xml_info; components=GetPathComponents(path,&number_components); @@ -434,7 +434,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (xml_info->parent != (XMLTreeInfo ) NULL) return; @@ -485,7 +485,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); DestroyXMLTreeChild(xml_info); DestroyXMLTreeOrdered(xml_info); @@ -671,7 +671,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(xml_info->next); } @@ -716,7 +716,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (xml_info->attributes == (char ) NULL) return((const char ) NULL); @@ -779,9 +779,9 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((const XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(attributes != (SplayTreeInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (xml_info->attributes == (char ) NULL) return(MagickTrue); i=0; @@ -826,7 +826,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); child=xml_info->child; if (tag != (const char ) NULL) @@ -863,7 +863,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(xml_info->content); } @@ -895,7 +895,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(xml_info->ordered); } @@ -948,7 +948,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); node=xml_info; components=GetPathComponents(path,&number_components); @@ -1013,7 +1013,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); root=(XMLTreeRoot ) xml_info; while (root->root.parent != (XMLTreeInfo ) NULL) @@ -1054,7 +1054,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(xml_info->sibling); } @@ -1086,7 +1086,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(xml_info->tag); } @@ -2348,7 +2348,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (xml_info->next != (XMLTreeInfo ) NULL) xml_info->next->sibling=xml_info->sibling; @@ -2426,7 +2426,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); i=0; while ((xml_info->attributes[i] != (char ) NULL) && @@ -2512,7 +2512,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (xml_info->content != (char ) NULL) xml_info->content=DestroyString(xml_info->content); @@ -2713,7 +2713,7 @@ assert(xml_info != (XMLTreeInfo ) NULL); assert((xml_info->signature == MagickCoreSignature) \|\| (((XMLTreeRoot ) xml_info)->signature == MagickCoreSignature)); - if (xml_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (xml_info->tag == (char ) NULL) return((char *) NULL);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/xwindow-private.h ^
@@ -325,10 +325,11 @@ gravity; char - home_directory[MagickPathExtent]; - - char + home_directory[MagickPathExtent], *matte_color; + + MagickBooleanType + debug; } XResourceInfo; typedef struct _XWindowInfo
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickCore/xwindow.c ^
@@ -507,11 +507,12 @@ /* Initialize annotated image. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(pixel != (XPixelInfo ) NULL); assert(annotate_info != (XAnnotateInfo ) NULL); assert(image != (Image ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); / Initialize annotated pixmap. / @@ -926,10 +927,11 @@ / Determine if the window manager has specified preferred icon sizes. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(window != (XWindowInfo ) NULL); assert(image != (Image ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); window->width=MaxIconSize; window->height=MaxIconSize; icon_size=(XIconSize ) NULL; @@ -1053,9 +1055,10 @@ / Find closest representation for the requested RGB color. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(color != (XColor ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); status=XAllocColor(display,colormap,color); if (status != False) return; @@ -1184,10 +1187,11 @@ / Restrict visual search by screen number. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(map_info != (XStandardColormap ) NULL); assert(resource_info != (XResourceInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); map_type=resource_info->map_type; visual_type=resource_info->visual_type; visual_mask=VisualScreenMask; @@ -1458,8 +1462,9 @@ MagickPrivate int XCheckDefineCursor(Display display,Window window, Cursor cursor) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (window == XRootWindow(display,XDefaultScreen(display))) return(0); return(XDefineCursor(display,window,cursor)); @@ -1499,9 +1504,10 @@ XEvent event; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(windows != (XWindows ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); XDelay(display,SuspendTime); id=windows->command.id; while (XCheckTypedWindowEvent(display,id,Expose,&event) != MagickFalse) @@ -1621,8 +1627,9 @@ Window client_window; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); state=XInternAtom(display,"WM_STATE",MagickTrue); if (state == (Atom) NULL) return(target_window); @@ -1752,9 +1759,10 @@ int limit; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(window_info != (XWindowInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); limit=XDisplayWidth(display,window_info->screen)-window_info->width; if (window_info->x < 0) window_info->x=0; @@ -1890,8 +1898,9 @@ / If there are previous resources on the root window, destroy them. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); property=XInternAtom(display,"_XSETROOT_ID",MagickFalse); if (property == (Atom) NULL) { @@ -1981,7 +1990,7 @@ assert(resource_info != (XResourceInfo ) NULL); assert(windows != (XWindows ) NULL); assert(image != (Image ) NULL); - if (image->debug) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); file=(FILE ) NULL; unique_file=AcquireUniqueFileResource(filename); @@ -2326,7 +2335,7 @@ assert(pixel != (XPixelInfo ) NULL); assert(draw_info != (XDrawInfo ) NULL); assert(image != (Image ) NULL); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); / Initialize drawd pixmap. @@ -2664,9 +2673,10 @@ MagickExport int XError(Display display,XErrorEvent error) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(error != (XErrorEvent ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); xerror_alert=MagickTrue; switch (error->request_code) { @@ -2741,9 +2751,10 @@ XStandardColormap map_info,XPixelInfo pixel,XFontStruct font_info, XResourceInfo resource_info,XWindowInfo window_info) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(resource_info != (XResourceInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (window_info != (XWindowInfo ) NULL) { /* @@ -2837,10 +2848,11 @@ /* Free colormap. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(visual_info != (XVisualInfo ) NULL); assert(map_info != (XStandardColormap ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); (void) XFlush(display); if (map_info->colormap != (Colormap) NULL) { @@ -2889,8 +2901,9 @@ /* Initialize annotate structure. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(annotate_info != (XAnnotateInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); annotate_info->x=0; annotate_info->y=0; annotate_info->width=0; @@ -2940,9 +2953,10 @@ /* Initialize map info. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(visual_info != (XVisualInfo ) NULL); assert(map_info != (XStandardColormap ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); map_info->colormap=colormap; map_info->red_max=visual_info->red_mask; map_info->red_mult=(size_t) (map_info->red_max != 0 ? 1 : 0); @@ -3044,12 +3058,13 @@ / Initialize pixel info. / - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(display != (Display ) NULL); assert(visual_info != (XVisualInfo ) NULL); assert(map_info != (XStandardColormap ) NULL); assert(resource_info != (XResourceInfo ) NULL); assert(pixel != (XPixelInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); pixel->colors=0;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/animate.c ^
@@ -282,9 +282,9 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (argc == 2) { option=argv[1];
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/compare.c ^
@@ -92,6 +92,7 @@ " -list type print a list of supported option arguments\n" " -log format format of debugging information", operators[] = + " -auto-orient automagically orient (rotate) image\n" " -brightness-contrast geometry\n" " improve brightness / contrast of the image\n" " -distort method args\n" @@ -277,9 +278,9 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (argc == 2) { option=argv[1]; @@ -378,6 +379,8 @@ "UnrecognizedAlphaChannelOption",argv[i]); break; } + if (LocaleCompare("auto-orient",option+1) == 0) + break; if (LocaleCompare("authenticate",option+1) == 0) { if (option == '+')
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/composite.c ^
@@ -123,9 +123,9 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image *) NULL); assert((image)->signature == MagickCoreSignature); - if ((image)->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(image)->filename); assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(image)->filename); (void) image_info; status=MagickTrue; composite_options->clip_to_self=GetCompositeClipToSelf( @@ -470,9 +470,9 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (argc == 2) { option=argv[1];
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/conjure.c ^
@@ -164,9 +164,9 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (argc < 2) return(ConjureUsage()); image=NewImageList();
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/convert.c ^
@@ -542,9 +542,9 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (argc == 2) { option=argv[1];
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/display.c ^
@@ -331,9 +331,9 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (argc == 2) { option=argv[1];
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/identify.c ^
@@ -134,7 +134,6 @@ " -ping efficiently determine image attributes\n" " -precision value maximum number of significant digits to print\n" " -quiet suppress all warning messages\n" - " -read-mask filename associate a read mask with the image\n" " -regard-warnings pay attention to warning messages\n" " -respect-parentheses settings remain in effect until parenthesis boundary\n" " -sampling-factor geometry\n" @@ -228,9 +227,9 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (argc == 2) { option=argv[1];
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/import.c ^
@@ -280,9 +280,9 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (argc == 2) { option=argv[1];
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/magick-wand.c ^
@@ -781,7 +781,8 @@ / WandExport void MagickRelinquishMemory(void *memory) { - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); return(RelinquishMagickMemory(memory)); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/mogrify.c ^
@@ -488,10 +488,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); / Limit channels according to image - and add up number of color channel. / @@ -751,7 +751,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert((image)->signature == MagickCoreSignature); - if ((image)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(image)->filename); if (argc < 0) return(MagickTrue); @@ -2010,9 +2010,9 @@ (void) SyncImageSettings(mogrify_info,image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) - geometry_info.sigma=100.0; + geometry_info.sigma=300.0; if ((flags & XiValue) == 0) - geometry_info.xi=0.01; + geometry_info.xi=0.0001; (void) KmeansImage(image,(size_t) geometry_info.rho, (size_t) geometry_info.sigma,geometry_info.xi,exception); break; @@ -3974,7 +3974,7 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo ) NULL); if (argc == 2) @@ -6799,7 +6799,7 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); if (argc < 0) @@ -7918,7 +7918,7 @@ assert(images != (Image ) NULL); assert((images)->previous == (Image ) NULL); assert((images)->signature == MagickCoreSignature); - if ((images)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (images)->filename); if ((argc <= 0) \|\| (argv == (char ) NULL)) @@ -8275,8 +8275,22 @@ break; } } - status&=CompositeImage(canvas_image,new_images,OverCompositeOp, - clip_to_self,0,0,exception); + switch (compose) + { + case DisplaceCompositeOp: + case DistortCompositeOp: + { + status&=CompositeImage(canvas_image,new_images, + CopyCompositeOp,clip_to_self,0,0,exception); + break; + } + default: + { + status&=CompositeImage(canvas_image,new_images, + OverCompositeOp,clip_to_self,0,0,exception); + break; + } + } new_images=DestroyImageList(new_images); new_images=canvas_image; mask_image=DestroyImage(mask_image); @@ -9157,7 +9171,7 @@ return(MogrifyImage(image_info,argc,argv,images,exception)); assert((images)->previous == (Image ) NULL); assert((images)->signature == MagickCoreSignature); - if ((images)->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", (images)->filename); if ((argc <= 0) \|\| (argv == (char *) NULL))
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/montage.c ^
@@ -312,9 +312,9 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (argc == 2) { option=argv[1];
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/operation.c ^
@@ -209,10 +209,10 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); /* Limit channels according to image add up number of values needed per color. @@ -2614,9 +2614,9 @@ if ((flags & (RhoValue\|SigmaValue)) == 0) CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1); if ((flags & SigmaValue) == 0) - geometry_info.sigma=100.0; + geometry_info.sigma=300.0; if ((flags & XiValue) == 0) - geometry_info.xi=0.01; + geometry_info.xi=0.0001; (void) KmeansImage(_image,(size_t) geometry_info.rho,(size_t) geometry_info.sigma,geometry_info.xi,_exception); break; @@ -4064,10 +4064,10 @@ else { Image - canvas_images; + canvas_image; - canvas_images=CloneImage(new_images,0,0,MagickTrue,_exception); - if (canvas_images == (Image ) NULL) + canvas_image=CloneImage(new_images,0,0,MagickTrue,_exception); + if (canvas_image == (Image ) NULL) break; switch (compose) { @@ -4116,10 +4116,24 @@ break; } } - status&=CompositeImage(canvas_images,new_images,OverCompositeOp, - clip_to_self,0,0,_exception); + switch (compose) + { + case DisplaceCompositeOp: + case DistortCompositeOp: + { + status&=CompositeImage(canvas_image,new_images, + CopyCompositeOp,clip_to_self,0,0,_exception); + break; + } + default: + { + status&=CompositeImage(canvas_image,new_images, + OverCompositeOp,clip_to_self,0,0,_exception); + break; + } + } new_images=DestroyImageList(new_images); - new_images=canvas_images; + new_images=canvas_image; mask_image=DestroyImage(mask_image); } source_image=DestroyImage(source_image); @@ -4923,7 +4937,8 @@ (void) DeleteImageRegistry(key); write_images=CloneImageList(_images,_exception); write_info=CloneImageInfo(_image_info); - (void) WriteImages(write_info,write_images,arg1,_exception); + if (write_images != (Image *) NULL) + (void) WriteImages(write_info,write_images,arg1,_exception); write_info=DestroyImageInfo(write_info); write_images=DestroyImageList(write_images); break;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/stream.c ^
@@ -209,9 +209,9 @@ / assert(image_info != (ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(exception != (ExceptionInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); (void) metadata; if (argc == 2) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/wand-view.c ^
@@ -22,7 +22,7 @@ % March 2003 % % % % % -% Copyright @ 2003 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may %
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/MagickWand/wandcli.c ^
@@ -15,7 +15,7 @@ % Anthony Thyssen % % April 2011 % % % -% Copyright @ 2011 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may %
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/Makefile.am ^
@@ -96,7 +96,6 @@ TOP_EXTRA_DIST = \ AUTHORS.txt \ - ChangeLog.md \ LICENSE \ QuickStart.txt \ NOTICE \ @@ -170,7 +169,6 @@ doc_DATA = \ LICENSE \ - ChangeLog.md \ NEWS.txt endif @@ -282,7 +280,7 @@ fi ; \ touch magick-version -MagickCore/version.h: $(top_srcdir)/ChangeLog.md $(top_srcdir)/m4/version.m4 +MagickCore/version.h: $(top_srcdir)/m4/version.m4 # Automagically reconfigure libtool LIBTOOL_DEPS = @LIBTOOL_DEPS@
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/Makefile.in ^
@@ -256,8 +256,9 @@ TESTS = $(TESTS_TESTS) $(am__EXEEXT_5) XFAIL_TESTS = $(am__EXEEXT_6) $(am__EXEEXT_6) check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4) -@MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@am__append_1 = MagickCore/threshold-map.h +@WIN32_NATIVE_BUILD_TRUE@am__append_1 = -lws2_32 @MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@am__append_2 = MagickCore/threshold-map.h +@MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@am__append_3 = MagickCore/threshold-map.h subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_func_fseeko.m4 \ @@ -550,53 +551,53 @@ coders/info.h coders/inline.c coders/inline.h coders/ipl.c \ coders/ipl.h coders/jbig.h coders/jnx.c coders/jnx.h \ coders/jp2.h coders/jpeg.h coders/json.c coders/json.h \ - coders/jxl.c coders/jxl.h coders/kernel.c coders/kernel.h \ - coders/label.c coders/label.h coders/mac.c coders/mac.h \ - coders/magick.c coders/magick.h coders/map.c coders/map.h \ - coders/mask.c coders/mask.h coders/mat.c coders/mat.h \ - coders/matte.c coders/matte.h coders/meta.c coders/meta.h \ - coders/miff.c coders/miff.h coders/mono.c coders/mono.h \ - coders/mpc.c coders/mpc.h coders/mpr.c coders/mpr.h \ - coders/msl.c coders/msl.h coders/mtv.c coders/mtv.h \ - coders/mvg.c coders/mvg.h coders/null.c coders/null.h \ - coders/ora.c coders/ora.h coders/otb.c coders/otb.h \ - coders/palm.c coders/palm.h coders/pango.c coders/pango.h \ - coders/pattern.c coders/pattern.h coders/pcd.c coders/pcd.h \ - coders/pcl.c coders/pcl.h coders/pcx.c coders/pcx.h \ - coders/pdb.c coders/pdb.h coders/pdf.c coders/pdf.h \ - coders/pes.c coders/pes.h coders/pgx.c coders/pgx.h \ - coders/pict.c coders/pict.h coders/pix.c coders/pix.h \ - coders/plasma.c coders/plasma.h coders/png.h coders/pnm.c \ - coders/pnm.h coders/ps2.c coders/ps2.h coders/ps3.c \ - coders/ps3.h coders/ps.c coders/psd.c coders/psd.h \ - coders/psd-private.h coders/ps.h coders/pwp.c coders/pwp.h \ - coders/qoi.c coders/qoi.h coders/raw.c coders/raw.h \ - coders/rgb.c coders/rgb.h coders/rgf.c coders/rgf.h \ - coders/rla.c coders/rla.h coders/rle.c coders/rle.h \ - coders/scr.c coders/screenshot.c coders/screenshot.h \ - coders/scr.h coders/sct.c coders/sct.h coders/sfw.c \ - coders/sfw.h coders/sgi.c coders/sgi.h coders/sixel.c \ - coders/sixel.h coders/stegano.c coders/stegano.h \ - coders/strimg.c coders/strimg.h coders/sun.c coders/sun.h \ - coders/svg.c coders/svg.h coders/tga.c coders/tga.h \ - coders/thumbnail.c coders/thumbnail.h coders/tiff.h \ - coders/tile.c coders/tile.h coders/tim2.c coders/tim2.h \ - coders/tim.c coders/tim.h coders/ttf.c coders/ttf.h \ - coders/txt.c coders/txt.h coders/uil.c coders/uil.h \ - coders/url.c coders/url.h coders/uyvy.c coders/uyvy.h \ - coders/vicar.c coders/vicar.h coders/vid.c coders/vid.h \ - coders/video.c coders/video.h coders/viff.c coders/viff.h \ - coders/vips.c coders/vips.h coders/wbmp.c coders/wbmp.h \ - coders/webp.h coders/wmf.h coders/wpg.c coders/wpg.h \ - coders/xbm.c coders/xbm.h coders/xc.c coders/xcf.c \ - coders/xcf.h coders/xc.h coders/x.h coders/xpm.c coders/xpm.h \ - coders/xps.c coders/xps.h coders/xwd.h coders/yaml.c \ - coders/yaml.h coders/ycbcr.c coders/ycbcr.h coders/yuv.c \ - coders/yuv.h coders/dps.c coders/djvu.c coders/exr.c \ - coders/flif.c coders/fpx.c coders/clipboard.c coders/emf.c \ - coders/heic.c coders/jbig.c coders/jpeg.c coders/jp2.c \ - coders/png.c coders/ept.c coders/tiff.c coders/webp.c \ - coders/wmf.c coders/x.c coders/xwd.c filters/analyze.c + coders/jxl.h coders/kernel.c coders/kernel.h coders/label.c \ + coders/label.h coders/mac.c coders/mac.h coders/magick.c \ + coders/magick.h coders/map.c coders/map.h coders/mask.c \ + coders/mask.h coders/mat.c coders/mat.h coders/matte.c \ + coders/matte.h coders/meta.c coders/meta.h coders/miff.c \ + coders/miff.h coders/mono.c coders/mono.h coders/mpc.c \ + coders/mpc.h coders/mpr.c coders/mpr.h coders/msl.c \ + coders/msl.h coders/mtv.c coders/mtv.h coders/mvg.c \ + coders/mvg.h coders/null.c coders/null.h coders/ora.c \ + coders/ora.h coders/otb.c coders/otb.h coders/palm.c \ + coders/palm.h coders/pango.c coders/pango.h coders/pattern.c \ + coders/pattern.h coders/pcd.c coders/pcd.h coders/pcl.c \ + coders/pcl.h coders/pcx.c coders/pcx.h coders/pdb.c \ + coders/pdb.h coders/pdf.c coders/pdf.h coders/pes.c \ + coders/pes.h coders/pgx.c coders/pgx.h coders/pict.c \ + coders/pict.h coders/pix.c coders/pix.h coders/plasma.c \ + coders/plasma.h coders/png.h coders/pnm.c coders/pnm.h \ + coders/ps2.c coders/ps2.h coders/ps3.c coders/ps3.h \ + coders/ps.c coders/psd.c coders/psd.h coders/psd-private.h \ + coders/ps.h coders/pwp.c coders/pwp.h coders/qoi.c \ + coders/qoi.h coders/raw.c coders/raw.h coders/rgb.c \ + coders/rgb.h coders/rgf.c coders/rgf.h coders/rla.c \ + coders/rla.h coders/rle.c coders/rle.h coders/scr.c \ + coders/screenshot.c coders/screenshot.h coders/scr.h \ + coders/sct.c coders/sct.h coders/sfw.c coders/sfw.h \ + coders/sgi.c coders/sgi.h coders/sixel.c coders/sixel.h \ + coders/stegano.c coders/stegano.h coders/strimg.c \ + coders/strimg.h coders/sun.c coders/sun.h coders/svg.c \ + coders/svg.h coders/tga.c coders/tga.h coders/thumbnail.c \ + coders/thumbnail.h coders/tiff.h coders/tile.c coders/tile.h \ + coders/tim2.c coders/tim2.h coders/tim.c coders/tim.h \ + coders/ttf.c coders/ttf.h coders/txt.c coders/txt.h \ + coders/uil.c coders/uil.h coders/url.c coders/url.h \ + coders/uyvy.c coders/uyvy.h coders/vicar.c coders/vicar.h \ + coders/vid.c coders/vid.h coders/video.c coders/video.h \ + coders/viff.c coders/viff.h coders/vips.c coders/vips.h \ + coders/wbmp.c coders/wbmp.h coders/webp.h coders/wmf.h \ + coders/wpg.c coders/wpg.h coders/xbm.c coders/xbm.h \ + coders/xc.c coders/xcf.c coders/xcf.h coders/xc.h coders/x.h \ + coders/xpm.c coders/xpm.h coders/xps.c coders/xps.h \ + coders/xwd.h coders/yaml.c coders/yaml.h coders/ycbcr.c \ + coders/ycbcr.h coders/yuv.c coders/yuv.h coders/dps.c \ + coders/djvu.c coders/exr.c coders/flif.c coders/fpx.c \ + coders/clipboard.c coders/emf.c coders/heic.c coders/jbig.c \ + coders/jpeg.c coders/jp2.c coders/jxl.c coders/png.c \ + coders/ept.c coders/tiff.c coders/webp.c coders/wmf.c \ + coders/x.c coders/xwd.c filters/analyze.c am__objects_1 = MagickCore/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-accelerate.lo \ MagickCore/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \ MagickCore/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-annotate.lo \ @@ -752,7 +753,6 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ipl.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jnx.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-json.lo \ - coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-kernel.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-label.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-mac.lo \ @@ -3524,7 +3524,7 @@ DISTCHECK_CONFIGURE_FLAGS = $(DISTCHECK_CONFIG_FLAGS) DISTCLEANFILES = _configs.sed MagickCore/magick-baseconfig.h CLEANFILES = $(MAGICKWAND_CLEANFILES) $(MAGICKPP_CLEANFILES) \ - $(UTILITIES_CLEANFILES) $(TESTS_CLEANFILES) $(am__append_2) + $(UTILITIES_CLEANFILES) $(TESTS_CLEANFILES) $(am__append_3) # Binary scripts bin_SCRIPTS = \ @@ -3562,7 +3562,6 @@ TOP_EXTRA_DIST = \ AUTHORS.txt \ - ChangeLog.md \ LICENSE \ QuickStart.txt \ NOTICE \ @@ -3822,7 +3821,6 @@ coders/jpeg.h \ coders/json.c \ coders/json.h \ - coders/jxl.c \ coders/jxl.h \ coders/kernel.c \ coders/kernel.h \ @@ -5145,10 +5143,12 @@ MAGICKCORE_LIBS = MagickCore/libMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.la @WITH_MODULES_FALSE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = $(MAGICKCORE_BASE_SRCS) $(MAGICKCORE_PLATFORM_SRCS) $(MAGICKCORE_CODER_SRCS) $(MAGICKCORE_FILTER_SRCS) @WITH_MODULES_TRUE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = $(MAGICKCORE_BASE_SRCS) $(MAGICKCORE_PLATFORM_SRCS) -@WITH_MODULES_FALSE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICK_DEP_LIBS) -@WITH_MODULES_TRUE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICK_DEP_LIBS) +@WITH_MODULES_FALSE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = \ +@WITH_MODULES_FALSE@ $(MAGICK_DEP_LIBS) $(am__append_1) +@WITH_MODULES_TRUE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = \ +@WITH_MODULES_TRUE@ $(MAGICK_DEP_LIBS) $(am__append_1) nodist_MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = \ - $(am__append_1) + $(am__append_2) MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBRARY_EXTRA_CPPFLAGS) @HAVE_LD_VERSION_SCRIPT_FALSE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -export-symbols-regex ".*" @HAVE_LD_VERSION_SCRIPT_TRUE@MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS_VERSION = -Wl,--version-script=$(top_srcdir)/MagickCore/libMagickCore.map @@ -6116,7 +6116,6 @@ @INSTALL_DOC_TRUE@doc_DATA = \ @INSTALL_DOC_TRUE@ LICENSE \ -@INSTALL_DOC_TRUE@ ChangeLog.md \ @INSTALL_DOC_TRUE@ NEWS.txt @MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = \ @@ -6922,8 +6921,6 @@ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-json.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) -coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.lo: \ - coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-kernel.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-label.lo: \ @@ -7104,6 +7101,8 @@ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jp2.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.lo: \ + coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-png.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ept.lo: \ @@ -9577,13 +9576,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-json.lo `test -f 'coders/json.c' \|\| echo '$(srcdir)/'`coders/json.c -coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.lo: coders/jxl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.lo `test -f 'coders/jxl.c' \|\| echo '$(srcdir)/'`coders/jxl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/jxl.c' object='coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jxl.lo `test -f 'coders/jxl.c' \|\| echo '$(srcdir)/'`coders/jxl.c - coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-kernel.lo: coders/kernel.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-kernel.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-kernel.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-kernel.lo `test -f 'coders/kernel.c' \|\| echo '$(srcdir)/'`coders/kernel.c
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/NEWS.txt ^
@@ -28,7 +28,7 @@ If these options are prohibitive, you can reduce the quality of the image results. The default build is Q16 HDRI. If you disable HDRI, you use half -the memory and instead of predominately floating point operations, you use +the memory and instead of predominantly floating point operations, you use the typically more efficient integer operations. The tradeoff is reduced precision and you cannot process out of range pixel values (e.g. negative). If you build the Q8 non-HDRI version of ImageMagick, you again reduce the memory
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/NOTICE ^
@@ -15,7 +15,7 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -The full text of this license is availaible in the LICENSE file. +The full text of this license is available in the LICENSE file. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -91,7 +91,7 @@ "Software"), including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons who receive copies from any such party to do so, with the -only requirement being that this copyright notice remain intact. +only requirement being that this copyright notice remains intact. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/README.md ^
@@ -52,6 +52,7 @@ * [Montage](https://imagemagick.org/script/montage.php): juxtapose image thumbnails on an image canvas. * [Morphology of shapes](https://legacy.imagemagick.org/Usage/morphology/): extract features, describe shapes and recognize patterns in images. * [Motion picture support](https://imagemagick.org/script/motion-picture.php): read and write the common image formats used in digital film work. +* [Multispectral imagery](https://imagemagick.org/script/architecture.php#multispectral): support multispectral imagery up to 64 bands. * [Noise and color reduction](https://legacy.imagemagick.org/Usage/transform/#vision) Kuwahara Filter, mean-shift. * [Perceptual hash](http://www.fmwconcepts.com/misc_tests/perceptual_hash_test_results_510/index.html): maps visually identical images to the same or similar hash-- useful in image retrieval, authentication, indexing, or copy detection as well as digital watermarking. * [Special effects](https://legacy.imagemagick.org/Usage/blur/): blur, sharpen, threshold, or tint an image. @@ -76,4 +77,4 @@ * reduce lock contention with the [tcmalloc](http://goog-perftools.sourceforge.net/doc/tcmalloc.html) memory allocation library; * push large images to a solid-state drive, see [large image support](https://imagemagick.org/script/architecture.php#tera-pixel). -If these options are prohibitive, you can reduce the quality of the image results. The default build is Q16 HDRI. If you disable [HDRI](https://imagemagick.org/script/high-dynamic-range.php), you use half the memory and instead of predominately floating point operations, you use the typically more efficient integer operations. The tradeoff is reduced precision and you cannot process out of range pixel values (e.g. negative). If you build the Q8 non-HDRI version of ImageMagick, you again reduce the memory requirements in half-- and once again there is a tradeoff, even less precision and no out of range pixel values. For a Q8 non-HDRI build of ImageMagick, use these configure script options: --with-quantum-depth=8 --disable-hdri. +If these options are prohibitive, you can reduce the quality of the image results. The default build is Q16 HDRI. If you disable [HDRI](https://imagemagick.org/script/high-dynamic-range.php), you use half the memory and instead of predominantly floating point operations, you use the typically more efficient integer operations. The tradeoff is reduced precision and you cannot process out of range pixel values (e.g. negative). If you build the Q8 non-HDRI version of ImageMagick, you again reduce the memory requirements in half-- and once again there is a tradeoff, even less precision and no out of range pixel values. For a Q8 non-HDRI build of ImageMagick, use these configure script options: --with-quantum-depth=8 --disable-hdri.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/README.txt ^
@@ -129,7 +129,7 @@ If these options are prohibitive, you can reduce the quality of the image results. The default build is Q16 HDRI. If you disable HDRI, you use - half the memory and instead of predominately floating point operations, + half the memory and instead of predominantly floating point operations, you use the typically more efficient integer operations. The tradeoff is reduced precision and you cannot process out of range pixel values (e.g. negative). If you build the Q8 non-HDRI version of ImageMagick,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/SECURITY.md ^
@@ -4,10 +4,10 @@ ## Supported Versions -We encourage users to upgrade to the lastest ImageMagick release to ensure that all known security vulnerabilities are addressed. On request, we can backport a vulnerability to other ImageMagick versions. +We encourage users to upgrade to the latest ImageMagick release to ensure that all known security vulnerabilities are addressed. On request, we can backport a vulnerability to other ImageMagick versions. ## Reporting a Vulnerability Post any vulnerability as an [issue](https://github.com/ImageMagick/ImageMagick/issues). Or you can post privately to the ImageMagick development [team](https://imagemagick.org/script/contact.php). Most vulnerabilities are fixed within 48 hours. -In addition, request a [CVE](https://cve.mitre.org/cve/request_id.html). We rely on you to post CVE's so our development team can concentrate on delivering a robust security patch. +In addition, request a [CVE](https://www.cve.org/ResourcesSupport/ReportRequest). We rely on you to post CVE's so our development team can concentrate on delivering a robust security patch.
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/Makefile.am ^
@@ -201,7 +201,6 @@ coders/jpeg.h \ coders/json.c \ coders/json.h \ - coders/jxl.c \ coders/jxl.h \ coders/kernel.c \ coders/kernel.h \
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/aai.c ^
@@ -127,11 +127,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -360,10 +360,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/art.c ^
@@ -121,11 +121,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -309,10 +309,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ashlar.c ^
@@ -58,6 +58,7 @@ #include "MagickCore/quantum-private.h" #include "MagickCore/static.h" #include "MagickCore/string_.h" +#include "MagickCore/string-private.h" #include "MagickCore/module.h" #include "MagickCore/utility.h" #include "MagickCore/xwindow.h" @@ -492,8 +493,8 @@ return(status); /* return true if room is found for all tiles / } -static MagickBooleanType WriteASHLARImage(const ImageInfo image_info, - Image image,ExceptionInfo exception) +static Image ASHLARImage(const ImageInfo image_info,Image image, + ExceptionInfo exception) { AshlarInfo ashlar_info; @@ -508,9 +509,6 @@ ashlar_image, next; - ImageInfo - write_info; - MagickBooleanType status; @@ -528,12 +526,6 @@ / Convert image sequence laid out in continuous irregular courses. / - assert(image_info != (const ImageInfo ) NULL); - assert(image_info->signature == MagickCoreSignature); - assert(image != (Image ) NULL); - assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image_info->extract != (char ) NULL) (void) ParseAbsoluteGeometry(image_info->extract,&geometry); else @@ -560,7 +552,7 @@ if (status == MagickFalse) { ashlar_image=DestroyImageList(ashlar_image); - return(MagickFalse); + return((Image ) NULL); } (void) SetImageBackgroundColor(ashlar_image,exception); tiles=(CanvasInfo ) AcquireQuantumMemory(GetImageListLength(image), @@ -575,7 +567,7 @@ if (nodes != (NodeInfo ) NULL) nodes=(NodeInfo ) RelinquishMagickMemory(tiles); ashlar_image=DestroyImageList(ashlar_image); - ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); + ThrowImageException(ResourceLimitError,"MemoryAllocationFailed"); } /* Interate until we find a tile size that fits the canvas. @@ -667,20 +659,88 @@ (void) SetImageExtent(ashlar_image,extent.width,extent.height,exception); nodes=(NodeInfo ) RelinquishMagickMemory(nodes); tiles=(CanvasInfo ) RelinquishMagickMemory(tiles); + return(ashlar_image); +} + +static MagickBooleanType WriteASHLARImage(const ImageInfo image_info, + Image image,ExceptionInfo exception) +{ + const char + value; + + Image + ashlar_images; + + ImageInfo + write_info; + + MagickBooleanType + status; + + size_t + tiles_per_page; + + ssize_t + i; + /* Write ASHLAR canvas. / - (void) CopyMagickString(ashlar_image->filename,image_info->filename, + assert(image_info != (const ImageInfo ) NULL); + assert(image_info->signature == MagickCoreSignature); + assert(image != (Image ) NULL); + assert(image->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); + tiles_per_page=GetImageListLength(image); + value=GetImageOption(image_info,"ashlar:tiles"); + if (value != (const char ) NULL) + tiles_per_page=(size_t) MagickMax(StringToInteger(value),1); + ashlar_images=NewImageList(); + for (i=0; i < (ssize_t) GetImageListLength(image); i+=tiles_per_page) + { + char + scenes[MagickPathExtent]; + + Image + ashlar_image, + clone_images; + + (void) FormatLocaleString(scenes,MagickPathExtent,"%g-%g",(double) i, + (double) (i+tiles_per_page-1)); + clone_images=CloneImages(image,scenes,exception); + if (clone_images == (Image ) NULL) + { + if (ashlar_images != (Image ) NULL) + ashlar_images=DestroyImageList(ashlar_images); + break; + } + ashlar_image=ASHLARImage(image_info,clone_images,exception); + clone_images=DestroyImageList(clone_images); + if (ashlar_image == (Image ) NULL) + { + if (ashlar_images != (Image ) NULL) + ashlar_images=DestroyImageList(ashlar_images); + break; + } + AppendImageToList(&ashlar_images,ashlar_image); + } + if (ashlar_images == (Image ) NULL) + return(MagickFalse); + ashlar_images=GetFirstImageInList(ashlar_images); + (void) CopyMagickString(ashlar_images->filename,image_info->filename, MagickPathExtent); write_info=CloneImageInfo(image_info); write_info->magick='\0'; - (void) SetImageInfo(write_info,1,exception); + (void) SetImageInfo(write_info,(unsigned int) + GetImageListLength(ashlar_images),exception); if ((*write_info->magick == '\0') \|\| (LocaleCompare(write_info->magick,"ASHLAR") == 0)) - (void) FormatLocaleString(ashlar_image->filename,MagickPathExtent, + (void) FormatLocaleString(ashlar_images->filename,MagickPathExtent, "miff:%s",write_info->filename); - status=WriteImage(write_info,ashlar_image,exception); - ashlar_image=DestroyImage(ashlar_image); + status=WriteImages(write_info,ashlar_images,ashlar_images->filename, + exception); + ashlar_images=DestroyImageList(ashlar_images); write_info=DestroyImageInfo(write_info); - return(MagickTrue); + return(status); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/avs.c ^
@@ -129,11 +129,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -362,10 +362,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/bgr.c ^
@@ -136,11 +136,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -1120,7 +1120,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image_info->interlace != PartitionInterlace) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/bmp.c ^
@@ -219,9 +219,9 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(pixels != (unsigned char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) memset(pixels,0,number_pixelssizeof(pixels)); byte=0; x=0; @@ -401,10 +401,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(pixels != (const unsigned char ) NULL); assert(compressed_pixels != (unsigned char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); p=pixels; q=compressed_pixels; i=0; @@ -567,7 +567,7 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); assert(exception != (ExceptionInfo ) NULL); @@ -1703,10 +1703,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/bmp.h ^
@@ -22,7 +22,7 @@ MagickCoderHeader("BMP", 0, "CI") \ MagickCoderHeader("BMP", 0, "CP") \ MagickCoderHeader("BMP", 0, "IC") \ - MagickCoderHeader("BMP", 0, "IP") + MagickCoderHeader("BMP", 0, "PT") #define MagickBMPAliases \ MagickCoderAlias("BMP", "BMP2") \
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/braille.c ^
@@ -220,6 +220,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); + assert(exception != (ExceptionInfo ) NULL); + assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (LocaleCompare(image_info->magick,"UBRL") == 0) unicode=1; else if (LocaleCompare(image_info->magick,"UBRL6") == 0) @@ -238,10 +242,6 @@ } else cell_height=3; - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - assert(exception != (ExceptionInfo *) NULL); - assert(exception->signature == MagickCoreSignature); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/cals.c ^
@@ -181,11 +181,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -460,10 +460,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/caption.c ^
@@ -141,11 +141,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); (void) ResetImagePage(image,"0x0+0+0"); if ((image->columns != 0) && (image->rows != 0))
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/cin.c ^
@@ -426,11 +426,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -451,6 +451,8 @@ image->endian=(magick[0] == 0x80) && (magick[1] == 0x2a) && (magick[2] == 0x5f) && (magick[3] == 0xd7) ? MSBEndian : LSBEndian; cin.file.image_offset=ReadBlobLong(image); + if (cin.file.image_offset < 712) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); offset+=4; cin.file.generic_length=ReadBlobLong(image); offset+=4; @@ -950,10 +952,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/cip.c ^
@@ -189,10 +189,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/clip.c ^
@@ -101,11 +101,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void ) NULL,0); (void) CopyMagickString(read_info->magick,"MIFF",MagickPathExtent);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/clipboard.c ^
@@ -134,11 +134,11 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if (!IsClipboardFormatAvailable(CF_DIB) && !IsClipboardFormatAvailable(CF_DIBV5)) @@ -324,7 +324,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) ThrowWriterException(CoderError,"UnableToWriteImageData");
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/cmyk.c ^
@@ -136,11 +136,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -1223,7 +1223,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image_info->interlace != PartitionInterlace) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/cube.c ^
@@ -141,11 +141,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/cut.c ^
@@ -347,11 +347,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/dcm.c ^
@@ -3036,11 +3036,13 @@ 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 (stream_info->offsets != (ssize_t ) NULL) + stream_info->offsets=(ssize_t ) RelinquishMagickMemory( + stream_info->offsets); + stream_info=(DCMStreamInfo ) RelinquishMagickMemory(stream_info); + } if (stack != (LinkedListInfo ) NULL) stack=DestroyLinkedList(stack,RelinquishDCMInfo); if (data != (unsigned char ) NULL) @@ -3121,11 +3123,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -3269,17 +3271,17 @@ 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)); - if (info_copy == (DCMInfo ) NULL) + DCMInfo clone_info = (DCMInfo ) AcquireMagickMemory(sizeof(info)); + if (clone_info == (DCMInfo ) NULL) ThrowDCMException(ResourceLimitError,"MemoryAllocationFailed") - (void) memcpy(info_copy,&info,sizeof(info)); - info_copy->scale=(Quantum ) AcquireQuantumMemory( - info_copy->scale_size+1,sizeof(info_copy->scale)); - if (info_copy->scale == (Quantum ) NULL) + (void) memcpy(clone_info,&info,sizeof(info)); + clone_info->scale=(Quantum ) AcquireQuantumMemory( + clone_info->scale_size+1,sizeof(clone_info->scale)); + if (clone_info->scale == (Quantum ) NULL) ThrowDCMException(ResourceLimitError,"MemoryAllocationFailed") - (void) memcpy(info_copy->scale,info.scale,info_copy->scale_size - sizeof(info_copy->scale)); - AppendValueToLinkedList(stack,info_copy); + (void) memcpy(clone_info->scale,info.scale,clone_info->scale_size + sizeof(clone_info->scale)); + AppendValueToLinkedList(stack,clone_info); sequence_depth++; } datum=0; @@ -4022,8 +4024,8 @@ ThrowDCMException(CorruptImageError,"InsufficientImageDataInFile") if (info.scale != (Quantum ) NULL) info.scale=(Quantum ) RelinquishMagickMemory(info.scale); - info.scale_size=MagickMax(length,MaxMap)+1; - info.scale=(Quantum ) AcquireQuantumMemory(info.scale_size, + info.scale_size=MagickMax(length,MaxMap); + info.scale=(Quantum ) AcquireQuantumMemory(info.scale_size+1, sizeof(info.scale)); if (info.scale == (Quantum ) NULL) ThrowDCMException(ResourceLimitError,"MemoryAllocationFailed") @@ -4110,7 +4112,7 @@ { index=map.red[i]; if ((info.scale != (Quantum ) NULL) && (index >= 0) && - (index <= (int) info.max_value)) + (index < (int) info.scale_size)) index=(int) info.scale[index]; image->colormap[i].red=(MagickRealType) index; } @@ -4119,7 +4121,7 @@ { index=map.green[i]; if ((info.scale != (Quantum ) NULL) && (index >= 0) && - (index <= (int) info.max_value)) + (index < (int) info.scale_size)) index=(int) info.scale[index]; image->colormap[i].green=(MagickRealType) index; } @@ -4128,7 +4130,7 @@ { index=map.blue[i]; if ((info.scale != (Quantum ) NULL) && (index >= 0) && - (index <= (int) info.max_value)) + (index < (int) info.scale_size)) index=(int) info.scale[index]; image->colormap[i].blue=(MagickRealType) index; } @@ -4137,7 +4139,7 @@ { index=map.gray[i]; if ((info.scale != (Quantum *) NULL) && (index >= 0) && - (index <= (int) info.max_value)) + (index < (int) info.scale_size)) index=(int) info.scale[index]; image->colormap[i].red=(MagickRealType) index; image->colormap[i].green=(MagickRealType) index;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/dds.c ^
@@ -2547,11 +2547,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); cubemap=MagickFalse, volume=MagickFalse, read_mipmaps=MagickFalse; @@ -4102,7 +4102,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) @@ -4124,6 +4124,8 @@ { if (LocaleCompare(option,"dxt1") == 0) compression=FOURCC_DXT1; + if (LocaleCompare(option,"dxt5") == 0) + compression=FOURCC_DXT5; if (LocaleCompare(option,"none") == 0) pixelFormat=DDPF_RGB; }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/debug.c ^
@@ -197,7 +197,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/dib.c ^
@@ -177,9 +177,9 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(pixels != (unsigned char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) memset(pixels,0,number_pixelssizeof(pixels)); byte=0; x=0; @@ -356,10 +356,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(pixels != (const unsigned char ) NULL); assert(compressed_pixels != (unsigned char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); p=pixels; q=compressed_pixels; i=0; @@ -500,11 +500,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1121,10 +1121,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/djvu.c ^
@@ -750,7 +750,7 @@ images; int - logging, + logging = MagickFalse, use_cache; LoadContext @@ -767,21 +767,16 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - - - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); - - - logging = LogMagickEvent(CoderEvent,GetMagickModule(),"enter ReadDJVUImage()"); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); (void) logging; - image = AcquireImage(image_info,exception); /* mmc: ?? / - - + if (image->debug != MagickFalse) + logging=LogMagickEvent(CoderEvent,GetMagickModule(), + "enter ReadDJVUImage()"); lc = (LoadContext ) NULL; status = OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/dng.c ^
@@ -168,7 +168,7 @@ exception); (void) FormatMagickTime(raw_info->other.timestamp,sizeof(timestamp),timestamp); (void) SetImageProperty(image,"dng:create.date",timestamp,exception); - (void) FormatImageProperty(image,"dng:iso.setting","%0.1f", + (void) FormatImageProperty(image,"dng:iso.setting","%.0f", raw_info->other.iso_speed); #if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0,18) (void) SetImageProperty(image,"dng:software",raw_info->idata.software, @@ -176,13 +176,13 @@ if (raw_info->shootinginfo.BodySerial != '\0') (void) SetImageProperty(image,"dng:serial.number", raw_info->shootinginfo.BodySerial,exception); - (void) FormatImageProperty(image,"dng:exposure.time","1/%0.1f", + (void) FormatImageProperty(image,"dng:exposure.time","1/%.0f", PerceptibleReciprocal(raw_info->other.shutter)); (void) FormatImageProperty(image,"dng:f.number","%0.1f", raw_info->other.aperture); (void) FormatImageProperty(image,"dng:max.aperture.value","%0.1f", raw_info->lens.EXIF_MaxAp); - (void) FormatImageProperty(image,"dng:ocal.length","%0.1f", + (void) FormatImageProperty(image,"dng:focal.length","%0.1f m", raw_info->other.focal_len); (void) FormatImageProperty(image,"dng:wb.rb.levels","%f %f %f %f", raw_info->color.cam_mul[0],raw_info->color.cam_mul[2], @@ -206,6 +206,20 @@ (void) FormatImageProperty(image,"dng:focal.length.in.35mm.format","%d mm", raw_info->lens.FocalLengthIn35mmFormat); #endif +#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0,20) + (void) FormatImageProperty(image,"dng:gps.latitude", + "%.0f deg %.0f' %.2f\" N", + raw_info->other.parsed_gps.latitude[0], + raw_info->other.parsed_gps.latitude[1], + raw_info->other.parsed_gps.latitude[2]); + (void) FormatImageProperty(image,"dng:gps.longitude", + "%.0f deg %.0f' %.2f\" W", + raw_info->other.parsed_gps.longitude[0], + raw_info->other.parsed_gps.longitude[1], + raw_info->other.parsed_gps.longitude[2]); + (void) FormatImageProperty(image,"dng:gps.altitude","%.1f m", + raw_info->other.parsed_gps.altitude); +#endif } #endif @@ -417,11 +431,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/dot.c ^
@@ -120,12 +120,12 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); assert(graphic_context != (GVC_t ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/dps.c ^
@@ -156,11 +156,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); display=XOpenDisplay(image_info->server_name); if (display == (Display ) NULL) return((Image *) NULL);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/dpx.c ^
@@ -698,11 +698,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1362,6 +1362,7 @@ entry->magick=(IsImageFormatHandler ) IsDPX; entry->flags^=CoderAdjoinFlag; entry->flags\|=CoderDecoderSeekableStreamFlag; + entry->flags\|=CoderEndianSupportFlag; entry->note=ConstantString(DPXNote); (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); @@ -1521,7 +1522,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); horizontal_factor=4; vertical_factor=4; @@ -1995,17 +1996,6 @@ SetQuantumQuantum(quantum_info,32); SetQuantumPack(quantum_info,dpx.image.image_element[0].packing == 0 ? MagickTrue : MagickFalse); - quantum_type=RGBQuantum; - if (image->alpha_trait != UndefinedPixelTrait) - quantum_type=RGBAQuantum; - if (IsYCbCrCompatibleColorspace(image->colorspace) != MagickFalse) - { - quantum_type=CbYCrQuantum; - if (image->alpha_trait != UndefinedPixelTrait) - quantum_type=CbYCrAQuantum; - if ((horizontal_factor == 2) \|\| (vertical_factor == 2)) - quantum_type=CbYCrYQuantum; - } samples_per_pixel=1; quantum_type=GrayQuantum; component_type=dpx.image.image_element[0].descriptor; @@ -2038,7 +2028,20 @@ break; } default: + { + quantum_type=RGBAQuantum; + if (image->alpha_trait != UndefinedPixelTrait) + quantum_type=RGBQuantum; + if (IsYCbCrCompatibleColorspace(image->colorspace) != MagickFalse) + { + quantum_type=CbYCrQuantum; + if (image->alpha_trait != UndefinedPixelTrait) + quantum_type=CbYCrAQuantum; + if ((horizontal_factor == 2) \|\| (vertical_factor == 2)) + quantum_type=CbYCrYQuantum; + } break; + } } extent=GetBytesPerRow(image->columns,samples_per_pixel,image->depth, dpx.image.image_element[0].packing == 0 ? MagickFalse : MagickTrue);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/emf.c ^
@@ -706,10 +706,10 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + assert(exception != (ExceptionInfo ) NULL); + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - assert(exception != (ExceptionInfo *) NULL); image=AcquireImage(image_info,exception); if (Gdiplus::GdiplusStartup(&token,&startup_input,NULL) !=
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ept.c ^
@@ -184,11 +184,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -419,7 +419,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/exr.c ^
@@ -183,11 +183,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -485,10 +485,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/farbfeld.c ^
@@ -162,11 +162,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -353,10 +353,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/fax.c ^
@@ -192,11 +192,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -372,10 +372,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/fits.c ^
@@ -187,9 +187,9 @@ if (offset == -1) return(-1); number_pixels=(MagickSizeType) image->columnsimage->rows; - minima=GetFITSPixel(image,bits_per_pixel); - maxima=(minima); - for (i=1; i < (MagickOffsetType) number_pixels; i++) + minima=DBL_MAX; + maxima=DBL_MIN; + for (i=0; i < (MagickOffsetType) number_pixels; i++) { pixel=GetFITSPixel(image,bits_per_pixel); if (pixel < minima) @@ -288,11 +288,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -674,10 +674,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/fl32.c ^
@@ -163,11 +163,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -391,10 +391,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/flif.c ^
@@ -146,11 +146,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -426,7 +426,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((image->columns > 0xFFFF) \|\| (image->rows > 0xFFFF)) ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/fpx.c ^
@@ -184,11 +184,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -808,10 +808,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ftxt.c ^
@@ -37,27 +37,38 @@ % / -#include <MagickCore/studio.h> -#include <MagickCore/artifact.h> -#include <MagickCore/attribute.h> -#include <MagickCore/blob.h> +#include "MagickCore/studio.h" +#include "MagickCore/annotate.h" +#include "MagickCore/artifact.h" +#include "MagickCore/attribute.h" +#include "MagickCore/blob.h" #include "MagickCore/blob-private.h" -#include <MagickCore/cache.h> -#include <MagickCore/channel.h> -#include <MagickCore/colorspace.h> -#include <MagickCore/exception.h> +#include "MagickCore/cache.h" +#include "MagickCore/channel.h" +#include "MagickCore/color.h" +#include "MagickCore/color-private.h" +#include "MagickCore/colorspace.h" +#include "MagickCore/constitute.h" +#include "MagickCore/draw.h" +#include "MagickCore/exception.h" #include "MagickCore/exception-private.h" -#include <MagickCore/image.h> +#include "MagickCore/geometry.h" +#include "MagickCore/image.h" #include "MagickCore/image-private.h" -#include <MagickCore/list.h> -#include <MagickCore/magick.h> -#include <MagickCore/memory_.h> -#include <MagickCore/module.h> -#include <MagickCore/monitor.h> +#include "MagickCore/list.h" +#include "MagickCore/magick.h" +#include "MagickCore/memory_.h" +#include "MagickCore/module.h" +#include "MagickCore/monitor.h" #include "MagickCore/monitor-private.h" -#include <MagickCore/pixel-accessor.h> +#include "MagickCore/option.h" +#include "MagickCore/pixel-accessor.h" #include "MagickCore/quantum-private.h" -#include <MagickCore/string_.h> +#include "MagickCore/static.h" +#include "MagickCore/statistic.h" +#include "MagickCore/string_.h" +#include "MagickCore/token.h" +#include "coders/ftxt.h" / Define declaractions. @@ -227,7 +238,7 @@ char p; - // read hex integer + / read hex integer / p=buffer+1; while (p) { @@ -251,14 +262,14 @@ } else if ((buffer == '0') && ((buffer + 1) == 'x')) { - // read hex floating-point + /* read hex floating-point / val=strtold(buffer,tail); if ((expectType != vtAny) && (expectType != vtFltHex)) err=MagickTrue; } else { - // Read decimal floating-point (possibly a percent). + /* Read decimal floating-point (possibly a percent). / errno=0; val=strtold(buffer,tail); if (errno) @@ -388,11 +399,11 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -427,7 +438,7 @@ if (SetPixelMetaChannels (image, numMeta, exception) == MagickFalse) ThrowReaderException(OptionError,"SetPixelMetaChannelsFailure"); } - // make image zero (if RGB channels, transparent black). + / make image zero (if RGB channels, transparent black). / GetPixelInfo(image,&mppBlack); if (hasAlpha) mppBlack.alpha=TransparentAlpha; @@ -456,7 +467,7 @@ case 'j': if ((pf+1)=='\0') ThrowReaderException(DelegateFatalError,"EscapeJproblem"); - // Drop through... + /* Drop through... / default: if ((i+=2) >= MaxTextExtent) ThrowReaderException(DelegateFatalError,"ppf bust"); @@ -469,7 +480,7 @@ } else { - // Not escape + / Not escape / if (++i >= MaxTextExtent) ThrowReaderException (DelegateFatalError,"ppf bust"); ppf=pf; @@ -480,7 +491,7 @@ ppf='\0'; if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); - // How many channel values can we expect? + /* How many channel values can we expect? / nExpCh=0; for (i=0; i < (ssize_t) GetPixelChannels (image); i++) { @@ -595,7 +606,7 @@ i=0; for (;;) { - // Loop through input channels. + / Loop through input channels. / val=BufToFlt(pt,&tail,expectType,&typeErr); if (expectType == vtProp) val = QuantumRange; @@ -627,7 +638,7 @@ } case 'j': { - // Skip chars until we find char after ppf. + / Skip chars until we find char after ppf. / SkipUntil(image,(ppf+1),&eofInp,&chPushed); break; } @@ -668,7 +679,7 @@ } else { - // Not escape + / Not escape / chIn=ReadChar(image,&chPushed); if (chIn == EOF) { @@ -752,7 +763,7 @@ % size_t RegisterFTXTImage(void) % / -ModuleExport unsigned long RegisterFTXTImage(void) +ModuleExport size_t RegisterFTXTImage(void) { MagickInfo entry; @@ -848,7 +859,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) @@ -960,7 +971,7 @@ valMult=1.0; fltHexFmt=MagickTrue; } - // Output all "-channel" channels. + /* Output all "-channel" channels. / sSep[0]=sSep[1]='\0'; for (i=0; i < (ssize_t) GetPixelChannels (image); i++) { @@ -975,14 +986,14 @@ if ((traits & UpdatePixelTrait) != UpdatePixelTrait) continue; if (hexFmt) - FormatLocaleString(buffer,MaxTextExtent,"%s#%Lx",sSep, - (signed long long)(((long double)p[i])+0.5)); + FormatLocaleString(buffer,MaxTextExtent,"%s#%llx",sSep, + (signed long long)(((long double) p[i])+0.5)); else if (fltHexFmt) FormatLocaleString(buffer,MaxTextExtent,"%s%a",sSep, (double) p[i]); else - FormatLocaleString(buffer,MaxTextExtent,"%s%.Lg%s",sSep, - precision,p[i]*valMult,sSuff);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ghostscript-private.h ^
@@ -132,6 +132,8 @@ gsapi_init_with_args; ghost_info_struct.run_string=(int ()(gs_main_instance ,const char ,int, int )) gsapi_run_string; + ghost_info_struct.set_arg_encoding=(int ()(gs_main_instance, int)) + gsapi_set_arg_encoding; ghost_info_struct.set_stdio=(int ()(gs_main_instance ,int ()(void ,char , int),int ()(void ,const char ,int),int ()(void , const char , int))) gsapi_set_stdio; @@ -160,6 +162,7 @@ } (void) (ghost_info->set_stdio)(interpreter,(int (MagickDLLCall )(void , char ,int)) NULL,GhostscriptDelegateMessage,GhostscriptDelegateMessage); + (void) ghost_info->set_arg_encoding(interpreter,1); status=(ghost_info->init_with_args)(interpreter,argc-1,argv+1); if (status == 0) status=(ghost_info->run_string)(interpreter,"systemdict /start get exec\n",
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/gif.c ^
@@ -418,7 +418,7 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); data_size=(unsigned char) ReadBlobByte(image); if (data_size > MaximumLZWBits) @@ -881,7 +881,7 @@ count; unsigned char - block_count; + block_count = 0; assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); @@ -936,7 +936,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (ReadBlob(image,1,&data_size) != 1) ThrowBinaryException(CorruptImageError,"CorruptImage",image->filename); @@ -1008,11 +1008,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1556,10 +1556,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/gradient.c ^
@@ -118,11 +118,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if (image->columns == 0) image->columns=1; @@ -187,11 +187,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); (void) CopyMagickString(start_color,"white",MagickPathExtent); (void) CopyMagickString(stop_color,"black",MagickPathExtent); if (*image_info->filename != '\0')
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/gray.c ^
@@ -137,11 +137,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -831,7 +831,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image_info->interlace != PartitionInterlace) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/hald.c ^
@@ -111,11 +111,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); level=0; if (image_info->filename != '\0')
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/hdr.c ^
@@ -173,11 +173,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -695,10 +695,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/heic.c ^
@@ -80,13 +80,13 @@ #include <libheif/heif.h> #endif #endif - + #if defined(MAGICKCORE_HEIC_DELEGATE) /* Define declarations. / #define XmpNamespaceExtent 28 - + / Const declarations. / @@ -127,57 +127,54 @@ % / -static MagickBooleanType IsHeifSuccess(Image image,struct heif_error error, - ExceptionInfo exception) +static inline MagickBooleanType IsHEIFSuccess(Image image, + struct heif_error error,ExceptionInfo exception) { if (error->code == 0) return(MagickTrue); - ThrowBinaryException(CorruptImageError,error->message,image->filename); + (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError, + error->message,"(%d.%d) `%s'",error->code,error->subcode,image->filename); + return(MagickFalse); } static MagickBooleanType ReadHEICColorProfile(Image image, struct heif_image_handle image_handle,ExceptionInfo exception) { -#if LIBHEIF_NUMERIC_VERSION >= 0x01040000 size_t length; + struct heif_error + error; + + unsigned char + color_profile; + /* Read color profile. / length=heif_image_handle_get_raw_color_profile_size(image_handle); - if (length > 0) + if (length == 0) + return(MagickTrue); + if ((MagickSizeType) length > GetBlobSize(image)) + ThrowBinaryException(CorruptImageError,"InsufficientImageDataInFile", + image->filename); + color_profile=(unsigned char ) AcquireQuantumMemory(1,length); + if (color_profile == (unsigned char ) NULL) + return(MagickFalse); + error=heif_image_handle_get_raw_color_profile(image_handle,color_profile); + if (IsHEIFSuccess(image,&error,exception) != MagickFalse) { - unsigned char - color_buffer; + StringInfo + profile; - if ((MagickSizeType) length > GetBlobSize(image)) - ThrowBinaryException(CorruptImageError,"InsufficientImageDataInFile", - image->filename); - color_buffer=(unsigned char ) AcquireQuantumMemory(1,length); - if (color_buffer != (unsigned char ) NULL) + profile=BlobToStringInfo(color_profile,length); + if (profile != (StringInfo) NULL) { - struct heif_error - error; - - error=heif_image_handle_get_raw_color_profile(image_handle, - color_buffer); - if (error.code == 0) - { - StringInfo - profile; - - profile=BlobToStringInfo(color_buffer,length); - if (profile != (StringInfo) NULL) - { - (void) SetImageProfile(image,"icc",profile,exception); - profile=DestroyStringInfo(profile); - } - } + (void) SetImageProfile(image,"icc",profile,exception); + profile=DestroyStringInfo(profile); } - color_buffer=(unsigned char ) RelinquishMagickMemory(color_buffer); } -#endif + color_profile=(unsigned char ) RelinquishMagickMemory(color_profile); return(MagickTrue); } @@ -185,56 +182,53 @@ struct heif_image_handle image_handle,ExceptionInfo exception) { heif_item_id - exif_id; + id; int count; + size_t + length; + + struct heif_error + error; + + unsigned char + exif_profile; + / Read Exif profile. / count=heif_image_handle_get_list_of_metadata_block_IDs(image_handle,"Exif", - &exif_id,1); - if (count > 0) + &id,1); + if (count != 1) + return(MagickTrue); + length=heif_image_handle_get_metadata_size(image_handle,id); + if (length <= 8) + return(MagickTrue); + if ((MagickSizeType) length > GetBlobSize(image)) + ThrowBinaryException(CorruptImageError,"InsufficientImageDataInFile", + image->filename); + exif_profile=(unsigned char ) AcquireQuantumMemory(1,length); + if (exif_profile == (unsigned char ) NULL) + return(MagickFalse); + error=heif_image_handle_get_metadata(image_handle,id,exif_profile); + if (IsHEIFSuccess(image,&error,exception) != MagickFalse) { - size_t - exif_size; + StringInfo + profile; - unsigned char - exif_buffer; - - exif_size=heif_image_handle_get_metadata_size(image_handle,exif_id); - if ((MagickSizeType) exif_size > GetBlobSize(image)) - ThrowBinaryException(CorruptImageError,"InsufficientImageDataInFile", - image->filename); - exif_buffer=(unsigned char ) AcquireQuantumMemory(1,exif_size); - if (exif_buffer != (unsigned char ) NULL) + / + Skip first 4 bytes, the offset to the TIFF header. + / + profile=BlobToStringInfo(exif_profile+4,(size_t) length-4); + if (profile != (StringInfo) NULL) { - struct heif_error - error; - - error=heif_image_handle_get_metadata(image_handle, - exif_id,exif_buffer); - if (error.code == 0) - { - StringInfo - profile; - - / - Skip first 4 bytes, the offset to the TIFF header. - / - profile=(StringInfo) NULL; - if (exif_size > 8) - profile=BlobToStringInfo(exif_buffer+4,(size_t) exif_size-4); - if (profile != (StringInfo) NULL) - { - (void) SetImageProfile(image,"exif",profile,exception); - profile=DestroyStringInfo(profile); - } - } + (void) SetImageProfile(image,"exif",profile,exception); + profile=DestroyStringInfo(profile); } - exif_buffer=(unsigned char ) RelinquishMagickMemory(exif_buffer); - } + } + exif_profile=(unsigned char ) RelinquishMagickMemory(exif_profile); return(MagickTrue); } @@ -253,13 +247,21 @@ } static MagickBooleanType ReadHEICImageHandle(const ImageInfo image_info, - Image image,struct heif_image_handle image_handle, - ExceptionInfo *exception)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/histogram.c ^
@@ -222,7 +222,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); SetGeometry(image,&geometry);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/hrz.c ^
@@ -124,11 +124,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -301,10 +301,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/html.c ^
@@ -252,11 +252,11 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/info.c ^
@@ -176,7 +176,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/inline.c ^
@@ -118,11 +118,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); if (LocaleNCompare(image_info->filename,"data:",5) == 0) { char @@ -307,7 +307,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); write_info=CloneImageInfo(image_info); (void) SetImageInfo(write_info,1,exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ipl.c ^
@@ -203,11 +203,11 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if ( image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent, GetMagickModule(), "%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -544,10 +544,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/jbig.c ^
@@ -150,11 +150,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -450,10 +450,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/jnx.c ^
@@ -149,11 +149,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/jp2.c ^
@@ -278,9 +278,7 @@ jp2_stream; ssize_t - i; - - ssize_t + i, y; unsigned char @@ -291,11 +289,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -850,10 +848,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/jpeg.c ^
@@ -108,6 +108,7 @@ #define IPTC_MARKER (JPEG_APP0+IPTC_INDEX) #define XML_INDEX 1 #define XML_MARKER (JPEG_APP0+XML_INDEX) +#define MaxJPEGProfiles 16 #define MaxJPEGScans 1024 /* @@ -138,7 +139,7 @@ finished; StringInfo - profiles[16]; + profiles[MaxJPEGProfiles+1]; ExceptionInfo exception; @@ -415,7 +416,7 @@ } } -static boolean ReadProfileData(j_decompress_ptr jpeg_info,const size_t index, +static boolean ReadProfileData(j_decompress_ptr jpeg_info,const int index, const size_t length) { ExceptionInfo @@ -436,6 +437,12 @@ client_info=(JPEGClientInfo ) jpeg_info->client_data; exception=client_info->exception; image=client_info->image; + if ((index < 0) \|\| (index > MaxJPEGProfiles)) + { + (void) ThrowMagickException(exception,GetMagickModule(), + CorruptImageError,"TooManyProfiles","`%s'",image->filename); + return(FALSE); + } if (client_info->profiles[index] == (StringInfo ) NULL) { client_info->profiles[index]=BlobToStringInfo((const void ) NULL, @@ -443,8 +450,7 @@ if (client_info->profiles[index] == (StringInfo ) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","`%s'", - image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(FALSE); } p=GetStringInfoDatum(client_info->profiles[index]); @@ -472,8 +478,7 @@ if (i != (ssize_t) length) { (void) ThrowMagickException(exception,GetMagickModule(), - CorruptImageError,"InsufficientImageDataInFile","`%s'", - image->filename); + CorruptImageError,"InsufficientImageDataInFile","`%s'",image->filename); return(FALSE); } p='\0'; @@ -486,16 +491,22 @@ static boolean ReadComment(j_decompress_ptr jpeg_info) { #define GetProfileLength(jpeg_info,length) \ +do \ { \ int \ - c[2]; \ -\ - length=0; \ - c[0]=GetCharacter(jpeg_info); \ - c[1]=GetCharacter(jpeg_info); \ - if ((c[0] >= 0) && (c[1] >= 0)) \ - length=(size_t) ((c[0] << 8) \| c[1]); \ -} + c; \ + \ + if (((c=GetCharacter(jpeg_info)) == EOF) \|\| (c < 0)) \ + length=0; \ + else \ + { \ + length=256c; \ + if (((c=GetCharacter(jpeg_info)) == EOF) \|\| (c < 0)) \ + length=0; \ + else \ + length+=c; \ + } \ +} while(0) size_t length; @@ -1090,11 +1101,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1346,7 +1357,7 @@ (void) SetImageProperty(image,"jpeg:colorspace",value,exception); #if defined(D_ARITH_CODING_SUPPORTED) if (jpeg_info->arith_code == TRUE) - (void) SetImageProperty(image,"jpeg:coding","arithmetic",exception); + (void) SetImageProperty(image,"jpeg:arithmetic-coding","true",exception); #endif if (JPEGSetImageProfiles(client_info) == MagickFalse) { @@ -2260,10 +2271,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((LocaleCompare(image_info->magick,"JPS") == 0) && (image->next != (Image *) NULL)) image=AppendImages(image,MagickFalse,exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/json.c ^
@@ -328,7 +328,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); channel_statistics=(ChannelStatistics ) AcquireQuantumMemory( MaxPixelChannels+1,sizeof(channel_statistics)); @@ -966,7 +966,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); format='\0'; elapsed_time=GetElapsedTime(&image->timer); @@ -1708,7 +1708,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/jxl.c ^
@@ -43,6 +43,7 @@ #include "MagickCore/blob.h" #include "MagickCore/blob-private.h" #include "MagickCore/cache.h" +#include "MagickCore/colorspace-private.h" #include "MagickCore/exception.h" #include "MagickCore/exception-private.h" #include "MagickCore/image.h" @@ -76,55 +77,46 @@ exception; } MemoryManagerInfo; +#if defined(MAGICKCORE_JXL_DELEGATE) / Forward declarations. / static MagickBooleanType WriteJXLImage(const ImageInfo ,Image ,ExceptionInfo ); -#if defined(MAGICKCORE_JXL_DELEGATE) -static void JXLAcquireMemory(void opaque, size_t size) -{ - unsigned char - data; - - data=(unsigned char ) AcquireQuantumMemory(size,sizeof(data)); - if (data == (unsigned char ) NULL) - { - MemoryManagerInfo - memory_manager_info; - - memory_manager_info=(MemoryManagerInfo ) opaque; - (void) ThrowMagickException(memory_manager_info->exception, - GetMagickModule(),CoderError,"MemoryAllocationFailed","`%s'", - memory_manager_info->image->filename); - } - return(data); -} - -static void JXLRelinquishMemory(void magick_unused(opaque),void address) -{ - magick_unreferenced(opaque); - (void) RelinquishMagickMemory(address); -} - -static inline void JXLSetMemoryManager(JxlMemoryManager memory_manager, - MemoryManagerInfo memory_manager_info,Image image,ExceptionInfo exception) +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% I s J X L % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% IsJXL() returns MagickTrue if the image format type, identified by the +% magick string, is JXL. +% +% The format of the IsJXL method is: +% +% MagickBooleanType IsJXL(const unsigned char magick,const size_t length) +% +% A description of each parameter follows: +% +% o magick: compare image format pattern against these bytes. +% +% o length: Specifies the length of the magick string. +% +/ +static MagickBooleanType IsJXL(const unsigned char magick,const size_t length) { - memory_manager_info->image=image; - memory_manager_info->exception=exception; - memory_manager->opaque=memory_manager_info; - memory_manager->alloc=JXLAcquireMemory; - memory_manager->free=JXLRelinquishMemory; -} + JxlSignature + signature = JxlSignatureCheck(magick,length); -static inline void JXLSetFormat(Image image,JxlPixelFormat format) -{ - format->num_channels=(image->alpha_trait == BlendPixelTrait) ? 4U : 3U; - if (IsImageGray(image) != MagickFalse) - format->num_channels=(image->alpha_trait == BlendPixelTrait) ? 2U : 1U; - format->data_type=(image->depth > 16) ? JXL_TYPE_FLOAT : (image->depth > 8) ? - JXL_TYPE_UINT16 : JXL_TYPE_UINT8; + if ((signature == JXL_SIG_NOT_ENOUGH_BYTES) \|\| (signature == JXL_SIG_INVALID)) + return(MagickFalse); + return(MagickTrue); } / @@ -154,8 +146,43 @@ % o exception: return any errors or warnings in this structure. % / + +static void JXLAcquireMemory(void opaque,size_t size) +{ + unsigned char + data; + + data=(unsigned char ) AcquireQuantumMemory(size,sizeof(data)); + if (data == (unsigned char ) NULL) + { + MemoryManagerInfo + memory_manager_info; + + memory_manager_info=(MemoryManagerInfo ) opaque; + (void) ThrowMagickException(memory_manager_info->exception, + GetMagickModule(),CoderError,"MemoryAllocationFailed","`%s'", + memory_manager_info->image->filename); + } + return(data); +} + +static inline StorageType JXLDataTypeToStorageType(const JxlDataType data_type) +{ + switch (data_type) + { + case JXL_TYPE_FLOAT: + return FloatPixel; + case JXL_TYPE_UINT16: + return ShortPixel; + case JXL_TYPE_UINT8: + return CharPixel; + default: + return UndefinedPixel; + } +} + static inline OrientationType JXLOrientationToOrientation( - JxlOrientation orientation) + const JxlOrientation orientation) { switch (orientation) { @@ -179,19 +206,30 @@ } } -static inline StorageType JXLDataTypeToStorageType(const JxlDataType data_type) +static void JXLRelinquishMemory(void magick_unused(opaque),void address) { - switch (data_type) - { - case JXL_TYPE_FLOAT: - return FloatPixel; - case JXL_TYPE_UINT16: - return ShortPixel; - case JXL_TYPE_UINT8: - return CharPixel; - default: - return UndefinedPixel; - } + magick_unreferenced(opaque); + (void) RelinquishMagickMemory(address); +} + +static inline void JXLSetMemoryManager(JxlMemoryManager memory_manager, + MemoryManagerInfo memory_manager_info,Image image,ExceptionInfo exception) +{ + memory_manager_info->image=image; + memory_manager_info->exception=exception; + memory_manager->opaque=memory_manager_info; + memory_manager->alloc=JXLAcquireMemory; + memory_manager->free=JXLRelinquishMemory; +} + +static inline void JXLSetFormat(Image image,JxlPixelFormat pixel_format) +{ + pixel_format->num_channels=(image->alpha_trait == BlendPixelTrait) ? 4U : 3U; + if (IsGrayColorspace(image->colorspace) != MagickFalse) + pixel_format->num_channels=(image->alpha_trait == BlendPixelTrait) ? + 2U : 1U; + pixel_format->data_type=(image->depth > 16) ? JXL_TYPE_FLOAT : + (image->depth > 8) ? JXL_TYPE_UINT16 : JXL_TYPE_UINT8; } static Image ReadJXLImage(const ImageInfo image_info,ExceptionInfo exception) @@ -199,21 +237,19 @@ Image image; - JxlPixelFormat - format; - - JxlDecoderStatus - events_wanted; - JxlDecoder - decoder; + *jxl_info; JxlDecoderStatus - decoder_status;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/kernel.c ^
@@ -171,10 +171,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/label.c ^
@@ -130,11 +130,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); (void) ResetImagePage(image,"0x0+0+0"); if ((image->columns != 0) && (image->rows != 0)) @@ -234,8 +234,8 @@ image=DestroyImageList(image); return((Image ) NULL); } + high=draw_info->pointsize; } - high=draw_info->pointsize; while((high-low) > 0.5) { draw_info->pointsize=(low+high)/2.0;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/mac.c ^
@@ -121,11 +121,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/magick.c ^
@@ -13245,11 +13245,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); magick_image=CloneImage(image,0,0,MagickTrue,exception); if (magick_image == (Image ) NULL) ThrowWriterException(ResourceLimitError,exception->reason);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/map.c ^
@@ -138,11 +138,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -381,10 +381,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/mask.c ^
@@ -103,11 +103,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void ) NULL,0); (void) FormatLocaleString(read_info->filename,MagickPathExtent,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/mat.c ^
@@ -517,6 +517,7 @@ return NULL; } + (void) memset(&zip_info,0,sizeof(zip_info)); zip_info.zalloc=AcquireZIPMemory; zip_info.zfree=RelinquishZIPMemory; zip_info.opaque = (voidpf) NULL;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/meta.c ^
@@ -1188,11 +1188,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -2302,7 +2302,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (LocaleCompare(image_info->magick,"8BIM") == 0) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/miff.c ^
@@ -513,11 +513,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -842,6 +842,9 @@ { if (LocaleCompare(keyword,"id") == 0) { + if (id != '\0') + ThrowMIFFException(CorruptImageError, + "ImproperImageHeader"); (void) CopyMagickString(id,options,MagickPathExtent); break; } @@ -883,6 +886,21 @@ (void) SetImageProperty(image,keyword,options,exception); break; } + case 'n': + case 'N': + { + if (LocaleCompare(keyword,"number-channels") == 0) + { + image->number_channels=StringToUnsignedLong(options); + break; + } + if (LocaleCompare(keyword,"number-meta-channels") == 0) + { + image->number_meta_channels=StringToUnsignedLong(options); + break; + } + break; + } case 'o': case 'O': { @@ -1114,6 +1132,8 @@ (image->compression == UndefinedCompression) \|\| (image->colorspace == UndefinedColorspace) \|\| (image->columns == 0) \|\| (image->rows == 0) \|\| + (image->number_meta_channels > (MaxPixelChannels-MetaPixelChannels)) \|\| + ((image->number_channels+image->number_meta_channels) >= MaxPixelChannels) \|\| (image->depth == 0) \|\| (image->depth > 64)) { if (profiles != (LinkedListInfo ) NULL) @@ -1125,6 +1145,7 @@ CorruptImageError,"ImproperImageHeader","`%s'",image->filename); break; } + id='\0'; if (image->montage != (char ) NULL) { char @@ -1354,6 +1375,8 @@ if (image->alpha_trait != UndefinedPixelTrait) quantum_type=IndexAlphaQuantum; } + if (image->number_meta_channels != 0) + quantum_type=MultispectralQuantum; status=MagickTrue; GetPixelInfo(image,&pixel); #if defined(MAGICKCORE_BZLIB_DELEGATE) @@ -2060,10 +2083,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status); @@ -2150,6 +2173,10 @@ CommandOptionToMnemonic(MagickPixelTraitOptions,(ssize_t) image->alpha_trait)); (void) WriteBlobString(image,buffer); + (void) FormatLocaleString(buffer,MagickPathExtent, + "number-channels=%.20g number-meta-channels=%.20g\n", + (double) image->number_channels,(double) image->number_meta_channels); + (void) WriteBlobString(image,buffer); if (image->alpha_trait != UndefinedPixelTrait) (void) WriteBlobString(image,"matte=True\n"); (void) FormatLocaleString(buffer,MagickPathExtent,
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/mono.c ^
@@ -123,11 +123,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -308,10 +308,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/mpc.c ^
@@ -199,11 +199,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -786,7 +786,7 @@ (image->compression == UndefinedCompression) \|\| (image->columns == 0) \|\| (image->rows == 0) \|\| (image->number_channels > MaxPixelChannels) \|\| - (image->number_meta_channels > (MaxPixelChannels-StartMetaPixelChannel)) \|\| + (image->number_meta_channels > (MaxPixelChannels-MetaPixelChannels)) \|\| ((image->number_channels+image->number_meta_channels) >= MaxPixelChannels) \|\| (image->depth == 0) \|\| (image->depth > 64)) { @@ -1159,10 +1159,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/mpr.c ^
@@ -92,11 +92,11 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=(Image ) GetImageRegistry(ImageRegistryType,image_info->filename, exception); if (image == (Image ) NULL) @@ -218,9 +218,9 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - magick_unreferenced(image_info); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); + magick_unreferenced(image_info); status=SetImageRegistry(ImageRegistryType,image->filename,image,exception); return(status); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/msl.c ^
@@ -558,7 +558,7 @@ ssize_t n; - if (image != (Image ) NULL) + if ((IsEventLogging() != MagickFalse) && (image != (Image ) NULL)) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(msl_info != (MSLInfo ) NULL); msl_info->n++; @@ -7786,10 +7786,10 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + assert(image != (Image ) NULL); + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - assert(image != (Image ) NULL); msl_image=AcquireImage(image_info,exception); status=OpenBlob(image_info,msl_image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -7925,11 +7925,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=(Image ) NULL; (void) ProcessMSLScript(image_info,&image,exception); return(GetFirstImageInList(image)); @@ -8327,7 +8327,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); msl_image=CloneImage(image,0,0,MagickTrue,exception); status=ProcessMSLScript(image_info,&msl_image,exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/mtv.c ^
@@ -128,11 +128,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -364,10 +364,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/mvg.c ^
@@ -140,11 +140,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -348,7 +348,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); value=GetImageArtifact(image,"mvg:vector-graphics"); if (value == (const char *) NULL)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/null.c ^
@@ -120,11 +120,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if (image->columns == 0) image->columns=1; @@ -249,9 +249,9 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); assert(exception != (ExceptionInfo *) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) image_info; (void) exception; - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); return(MagickTrue); }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ora.c ^
@@ -146,7 +146,7 @@ image_metadata=AcquireImage(image_info,exception); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void *) NULL,0); - stat(image_info->filename,&stat_info); + (void) stat(image_info->filename,&stat_info); zip_archive=zip_open(image_info->filename,ZIP_RDONLY,&zip_error); if (zip_archive == NULL) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/otb.c ^
@@ -127,11 +127,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -328,10 +328,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/palm.c ^
@@ -293,11 +293,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -749,10 +749,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pango.c ^
@@ -184,11 +184,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); (void) ResetImagePage(image,"0x0+0+0"); if ((image->columns != 0) && (image->rows != 0))
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pcd.c ^
@@ -178,11 +178,11 @@ / assert(image != (const Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(luma != (unsigned char ) NULL); assert(chroma1 != (unsigned char ) NULL); assert(chroma2 != (unsigned char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); buffer=(unsigned char ) AcquireQuantumMemory(0x800,sizeof(buffer)); if (buffer == (unsigned char ) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", @@ -539,11 +539,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1113,7 +1113,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); pcd_image=image; if (image->columns < image->rows)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pcl.c ^
@@ -197,11 +197,11 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); /* Open image file. / @@ -295,8 +295,8 @@ / Set PCL render geometry. / - width=(size_t) floor(bounds.x2-bounds.x1+0.5); - height=(size_t) floor(bounds.y2-bounds.y1+0.5); + width=(size_t)CastDoubleToLong(floor(bounds.x2-bounds.x1+0.5)); + height=(size_t)CastDoubleToLong(floor(bounds.y2-bounds.y1+0.5)); if (width > page.width) page.width=width; if (height > page.height) @@ -711,10 +711,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pcx.c ^
@@ -266,11 +266,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -903,10 +903,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pdb.c ^
@@ -317,11 +317,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -790,10 +790,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pdf.c ^
@@ -273,8 +273,6 @@ continue; } } - if (c == EOF) - break; if (CompareMagickByteBuffer(&buffer,PDFRotate,strlen(PDFRotate)) != MagickFalse) { p=GetMagickByteBufferDatum(&buffer); @@ -439,11 +437,11 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); /* Open image file. / @@ -1135,10 +1133,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); pocket_mod=NewImageList(); pages=NewImageList(); i=0; @@ -1441,10 +1439,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pes.c ^
@@ -473,11 +473,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pgx.c ^
@@ -166,11 +166,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -359,10 +359,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pict.c ^
@@ -611,10 +611,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(scanline != (unsigned char ) NULL); assert(pixels != (unsigned char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); count=0; runlength=0; p=scanline+(bytes_per_line-1); @@ -882,7 +882,7 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); assert(exception != (ExceptionInfo ) NULL); @@ -1715,12 +1715,12 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + assert(exception != (ExceptionInfo ) NULL); + assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((image->columns > 65535L) \|\| (image->rows > 65535L)) ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit"); - assert(exception != (ExceptionInfo ) NULL); - assert(exception->signature == MagickCoreSignature); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pix.c ^
@@ -120,11 +120,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/png.c ^
@@ -937,7 +937,7 @@ } } - if (ok_to_reduce != MagickFalse) + if ((image->debug != MagickFalse) && (ok_to_reduce != MagickFalse)) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), " OK to reduce PNG bit depth to 8 without loss of info"); @@ -1709,8 +1709,9 @@ image=error_info->image; exception=error_info->exception; - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " libpng-%s error: %s", png_get_libpng_ver(NULL),message); + if (image->debug != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " libpng-%s error: %s", png_get_libpng_ver(NULL),message); (void) ThrowMagickException(exception,GetMagickModule(),CoderError,message, "`%s'",image->filename); @@ -1742,8 +1743,9 @@ error_info=(PNGErrorInfo ) png_get_error_ptr(ping); image=error_info->image; exception=error_info->exception; - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " libpng-%s warning: %s", png_get_libpng_ver(NULL),message); + if (image->debug != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " libpng-%s warning: %s", png_get_libpng_ver(NULL),message); (void) ThrowMagickException(exception,GetMagickModule(),CoderWarning, message,"`%s'",image->filename); @@ -1832,8 +1834,9 @@ length=StringToLong(sp); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " length: %lu",(unsigned long) length); + if (image->debug != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " length: %lu",(unsigned long) length); while ((sp != ' ' && sp != '\n') && extent--) sp++; @@ -2012,9 +2015,10 @@ return(n); success / - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " read_user_chunk: found %c%c%c%c chunk", - chunk->name[0],chunk->name[1],chunk->name[2],chunk->name[3]); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " read_user_chunk: found %c%c%c%c chunk", + chunk->name[0],chunk->name[1],chunk->name[2],chunk->name[3]); if ((chunk->name[0] == 101) && ((chunk->name[1] == 88) \|\| (chunk->name[1] == 120)) && @@ -2188,7 +2192,7 @@ unit_type = 0; MagickBooleanType - logging, + logging = MagickFalse, ping_found_cHRM, ping_found_gAMA, ping_found_iCCP, @@ -2775,22 +2779,25 @@ { if (got_crc == 0) { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Got a %lu-byte ICC profile (potentially sRGB)", - (unsigned long) profile_length); + if (logging != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " Got a %lu-byte ICC profile (potentially sRGB)", + (unsigned long) profile_length); data=GetStringInfoDatum(profile); profile_crc=crc32(0,data,profile_length); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), + if (logging != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), " with crc=%8x",(unsigned int) profile_crc); got_crc++; } if (profile_crc == sRGB_info[icheck].crc) { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " It is sRGB with rendering intent = %s", + if (logging != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " It is sRGB with rendering intent = %s", Magick_RenderingIntentString_from_PNG_RenderingIntent( sRGB_info[icheck].intent)); if (image->rendering_intent==UndefinedIntent) @@ -2805,9 +2812,10 @@ } if (sRGB_info[icheck].len == 0) { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Got %lu-byte ICC profile not recognized as sRGB", - (unsigned long) profile_length); + if (logging != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " Got %lu-byte ICC profile not recognized as sRGB", + (unsigned long) profile_length); (void) SetImageProfile(image,"icc",profile,exception); } } @@ -2927,8 +2935,9 @@ (image->rendering_intent)); file_gamma=0.45455f; ping_found_sRGB=MagickTrue; - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Setting sRGB as if in input"); + if (logging != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " Setting sRGB as if in input"); } } @@ -2940,9 +2949,10 @@ if (logging != MagickFalse) if (image->page.x \|\| image->page.y) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Reading PNG oFFs chunk: x: %.20g, y: %.20g.",(double) - image->page.x,(double) image->page.y); + if (logging != MagickFalse) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " Reading PNG oFFs chunk: x: %.20g, y: %.20g.",(double) + image->page.x,(double) image->page.y); } #endif #if defined(PNG_pHYs_SUPPORTED) @@ -3214,8 +3224,9 @@ double image_gamma = image->gamma; - (void)LogMagickEvent(CoderEvent,GetMagickModule(), - " image->gamma=%f",(float) image_gamma); + if (logging != MagickFalse) + (void)LogMagickEvent(CoderEvent,GetMagickModule(), + " image->gamma=%f",(float) image_gamma); if (image_gamma > 0.75) { @@ -3243,8 +3254,9 @@ double image_gamma = image->gamma; - (void)LogMagickEvent(CoderEvent,GetMagickModule(), - " image->gamma=%f",(float) image_gamma); + if (logging != MagickFalse) + (void)LogMagickEvent(CoderEvent,GetMagickModule(), + " image->gamma=%f",(float) image_gamma); if (image_gamma > 0.75) { @@ -3270,7 +3282,8 @@ image->gamma = image_gamma; } - (void)LogMagickEvent(CoderEvent,GetMagickModule(), + if (logging != MagickFalse) + (void)LogMagickEvent(CoderEvent,GetMagickModule(), " image->colorspace=%d",(int) image->colorspace); if (((int) ping_color_type == PNG_COLOR_TYPE_PALETTE) \|\| @@ -4251,7 +4264,7 @@ image; MagickBooleanType - logging, + logging = MagickFalse, status; MngInfo @@ -4268,15 +4281,14 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); - assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); - logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadPNGImage()"); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); + if (image->debug != MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pnm.c ^
@@ -261,7 +261,7 @@ if (comment_info.comment != (char ) NULL) \ comment_info.comment=DestroyString(comment_info.comment); \ if (quantum_info != (QuantumInfo ) NULL) \ - quantum_info=DestroyQuantumInfo(quantum_info); \ + quantum_info=DestroyQuantumInfo(quantum_info); \ ThrowReaderException((exception),(message)); \ } @@ -314,11 +314,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -329,6 +329,7 @@ / Read PNM image. / + comment_info.comment=(char ) NULL; quantum_info=(QuantumInfo ) NULL; count=ReadBlob(image,1,(unsigned char ) &format); do @@ -492,7 +493,10 @@ status=SetImageExtent(image,image->columns,image->rows,exception); if (status == MagickFalse) { - comment_info.comment=DestroyString(comment_info.comment); + if (comment_info.comment != (char ) NULL) + comment_info.comment=DestroyString(comment_info.comment); + if (quantum_info != (QuantumInfo ) NULL) + quantum_info=DestroyQuantumInfo(quantum_info); return(DestroyImageList(image)); } if (colorspace != UndefinedColorspace) @@ -1632,6 +1636,10 @@ } } while ((count == 1) && (format == 'P')); (void) CloseBlob(image); + if (comment_info.comment != (char ) NULL) + comment_info.comment=DestroyString(comment_info.comment); + if (quantum_info != (QuantumInfo ) NULL) + quantum_info=DestroyQuantumInfo(quantum_info); if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1815,10 +1823,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status); @@ -1965,7 +1973,7 @@ { packet_size=1; (void) CopyMagickString(type,"GRAYSCALE",MagickPathExtent); - if (IdentifyImageMonochrome(image,exception) != MagickFalse) + if (GetQuantumRange(image->depth) == 1) (void) CopyMagickString(type,"BLACKANDWHITE",MagickPathExtent); break; }
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ps.c ^
@@ -344,7 +344,10 @@ { if ((c == '\r') \|\| (c == '\n') \|\| ((i+1) == (ssize_t) sizeof(version))) - break; + { + new_line=MagickTrue; + break; + } version[i++]=(char) c; } version[i]='\0'; @@ -411,7 +414,10 @@ for (c=PeekMagickByteBuffer(&buffer); c != EOF; c=PeekMagickByteBuffer(&buffer)) { if ((c == '\r') \|\| (c == '\n') \|\| ((i+1) == MagickPathExtent)) - break; + { + new_line=MagickTrue; + break; + } name[i++]=(char) ReadMagickByteBuffer(&buffer); } name[i]='\0'; @@ -599,11 +605,9 @@ page; ssize_t + count, i; - ssize_t - count; - unsigned long scene; @@ -612,11 +616,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -697,6 +701,7 @@ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, "InvalidGeometry","`%s'",option); page_geometry=DestroyString(page_geometry); + CleanupPSInfo(&info); image=DestroyImage(image); return((Image ) NULL); } @@ -1453,10 +1458,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ps2.c ^
@@ -457,10 +457,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ps3.c ^
@@ -260,7 +260,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; length=(image->colorspace == CMYKColorspace ? 4 : 3)(size_t) @@ -333,7 +333,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; pack=SetImageMonochrome(image,exception) == MagickFalse ? 1UL : 8UL; @@ -402,7 +402,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; length=(size_t) image->columnsimage->rows; @@ -466,9 +466,9 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(image->alpha_trait != UndefinedPixelTrait); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; /* Note BeginData DSC comment for update later. @@ -886,10 +886,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(MagickFalse);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/psd.c ^
@@ -1022,8 +1022,9 @@ number_bits=8; for (bit = 0; bit < (ssize_t) number_bits; bit++) { - SetPSDPixel(image,channel,packet_size,(((unsigned char) pixel) - & (0x01 << (7-bit))) != 0 ? 0 : QuantumRange,q,exception); + SetPSDPixel(image,channel,packet_size, + (((unsigned char)((ssize_t) pixel)) & (0x01 << (7-bit))) != 0 ? 0 : + QuantumRange,q,exception); q+=GetPixelChannels(image); x++; } @@ -1377,7 +1378,7 @@ output_pixels=(unsigned char ) AcquireQuantumMemory(count, sizeof(output_pixels)); - if (pixels == (unsigned char ) NULL) + if (output_pixels == (unsigned char ) NULL) { compact_pixels=(unsigned char ) RelinquishMagickMemory( compact_pixels); @@ -1532,7 +1533,7 @@ if (index == 1) index=-1; else if (index > 1) - index=StartMetaPixelChannel+index-2; + index=MetaPixelChannels+index-2; break; } case LabMode: @@ -1542,7 +1543,7 @@ if (index == 3) index=-1; else if (index > 3) - index=StartMetaPixelChannel+index-4; + index=MetaPixelChannels+index-4; break; } case CMYKMode: @@ -1550,7 +1551,7 @@ if (index == 4) index=-1; else if (index > 4) - index=StartMetaPixelChannel+index-5; + index=MetaPixelChannels+index-5; break; } } @@ -2121,7 +2122,7 @@ / Layer name. / - length=(MagickSizeType) (unsigned char) ReadBlobByte(image); + length=(MagickSizeType) ((unsigned char) ReadBlobByte(image)); combined_length+=length+1; if (length > 0) (void) ReadBlob(image,(size_t) length++,layer_info[i].name); @@ -2375,12 +2376,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); - + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -2871,10 +2871,10 @@ / assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(pixels != (unsigned char ) NULL); assert(compact_pixels != (unsigned char ) NULL); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); packbits=(unsigned char ) AcquireQuantumMemory(128UL,sizeof(packbits)); if (packbits == (unsigned char ) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", @@ -3838,10 +3838,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/pwp.c ^
@@ -163,7 +163,7 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); assert(exception != (ExceptionInfo *) NULL);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/qoi.c ^
@@ -187,11 +187,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -460,10 +460,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/raw.c ^
@@ -130,11 +130,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -483,10 +483,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/rgb.c ^
@@ -136,11 +136,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -1031,11 +1031,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -1348,7 +1348,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image_info->interlace != PartitionInterlace) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/rgf.c ^
@@ -129,11 +129,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -333,10 +333,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/rla.c ^
@@ -192,11 +192,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/rle.c ^
@@ -202,11 +202,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/scr.c ^
@@ -142,11 +142,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/screenshot.c ^
@@ -106,11 +106,11 @@ image; assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=(Image *) NULL; #if defined(MAGICKCORE_WINGDI32_DELEGATE) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/sct.c ^
@@ -164,11 +164,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/sfw.c ^
@@ -235,11 +235,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/sgi.c ^
@@ -299,11 +299,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -949,10 +949,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/sixel.c ^
@@ -1062,11 +1062,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1303,7 +1303,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/stegano.c ^
@@ -132,11 +132,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); one=1; image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0))
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/strimg.c ^
@@ -120,11 +120,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); string=InterpretImageProperties((ImageInfo ) image_info,image, image_info->filename,exception); @@ -279,10 +279,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/sun.c ^
@@ -153,7 +153,8 @@ unsigned char byte; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(compressed_pixels != (unsigned char ) NULL); assert(pixels != (unsigned char ) NULL); p=compressed_pixels; @@ -281,11 +282,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -810,10 +811,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/svg.c ^
@@ -688,7 +688,8 @@ double value; - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",string); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",string); assert(string != (const char ) NULL); p=(const char ) string; (void) GetNextToken(p,&p,MagickPathExtent,token); @@ -3685,10 +3686,10 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); assert(exception != (ExceptionInfo ) NULL); - if (image_info->debug != MagickFalse) + assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - assert(exception->signature == MagickCoreSignature); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -4195,10 +4196,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/tga.c ^
@@ -188,11 +188,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -762,10 +762,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/tiff.c ^
@@ -365,11 +365,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -419,7 +419,7 @@ for (length=0; (c=ReadBlobByte(image)) != EOF; length++) if (fputc(c,file) != c) status=MagickFalse; - offset=(ssize_t) fseek(file,(ssize_t) offset,SEEK_SET); + offset=(ssize_t) fseek(file,(off_t) offset,SEEK_SET); length=WriteLSBLong(file,(unsigned int) length); if (ferror(file) != 0) { @@ -1263,18 +1263,18 @@ pixels; void - sans[5] = { NULL, NULL, NULL, NULL, NULL }; + sans[8] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; /* Open image. / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1585,7 +1585,9 @@ #endif default: image->compression=RLECompression; break; } - quantum_info=(QuantumInfo ) NULL; + quantum_info=AcquireQuantumInfo(image_info,image); + if (quantum_info == (QuantumInfo ) NULL) + ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed"); if ((photometric == PHOTOMETRIC_PALETTE) && (pow(2.0,1.0bits_per_sample) <= MaxColormapSize)) { @@ -1666,9 +1668,6 @@ /* Allocate memory for the image and pixel buffer. / - quantum_info=AcquireQuantumInfo(image_info,image); - if (quantum_info == (QuantumInfo ) NULL) - ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed"); if (sample_format == SAMPLEFORMAT_UINT) status=SetQuantumFormat(image,quantum_info,UnsignedQuantumFormat); if (sample_format == SAMPLEFORMAT_INT) @@ -1705,22 +1704,28 @@ image->alpha_trait=BlendPixelTrait; } else - for (i=0; i < extra_samples; i++) { - image->alpha_trait=BlendPixelTrait; - if (sample_info[i] == EXTRASAMPLE_ASSOCALPHA) - { - SetQuantumAlphaType(quantum_info,AssociatedQuantumAlpha); - (void) SetImageProperty(image,"tiff:alpha","associated", - exception); - } - else - if (sample_info[i] == EXTRASAMPLE_UNASSALPHA) + (void) SetPixelMetaChannels(image,extra_samples,exception); + for (i=0; i < extra_samples; i++) + { + image->alpha_trait=BlendPixelTrait; + if (sample_info[i] == EXTRASAMPLE_ASSOCALPHA) { - SetQuantumAlphaType(quantum_info,DisassociatedQuantumAlpha); - (void) SetImageProperty(image,"tiff:alpha","unassociated", + SetQuantumAlphaType(quantum_info,AssociatedQuantumAlpha); + (void) SetImageProperty(image,"tiff:alpha","associated", exception); } + else + if (sample_info[i] == EXTRASAMPLE_UNASSALPHA) + { + SetQuantumAlphaType(quantum_info,DisassociatedQuantumAlpha); + (void) SetImageProperty(image,"tiff:alpha","unassociated", + exception); + } + } + (void) SetPixelMetaChannels(image,extra_samples,exception); + if (image->alpha_trait != UndefinedPixelTrait) + (void) SetPixelMetaChannels(image,extra_samples-1,exception); } } if (image->alpha_trait != UndefinedPixelTrait) @@ -1816,6 +1821,11 @@ ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed"); } } + if (image->number_meta_channels != 0) + { + quantum_type=MultispectralQuantum; + quantum_info->pad=0; + } switch (method) { case ReadYCCKMethod: @@ -1919,7 +1929,8 @@ break; } case 4: quantum_type=AlphaQuantum; break; - default: break; + default: + break; } rows_remaining=0; for (y=0; y < (ssize_t) image->rows; y++) @@ -1987,7 +1998,7 @@ number_pixels=(MagickSizeType) columnsrows; if (HeapOverflowSanityCheck(rows,sizeof(tile_pixels)) != MagickFalse) ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed"); - extent=MagickMax(rowsTIFFTileRowSize(tiff),TIFFTileSize(tiff)); + extent=4MagickMax(rowsTIFFTileRowSize(tiff),TIFFTileSize(tiff)); #if defined(TIFF_VERSION_BIG) extent+=image->columnssizeof(uint64); #else @@ -2554,10 +2565,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status); @@ -2580,7 +2591,7 @@ } (void) FormatLocaleString(huffman_image->filename,MagickPathExtent,"tiff:%s", filename); - if (IsImageMonochrome(image) == MagickFalse) + if (IsImageMonochrome(huffman_image) == MagickFalse) (void) SetImageType(huffman_image,BilevelType,exception); write_info=CloneImageInfo((ImageInfo ) NULL); SetImageInfoFile(write_info,file); @@ -2893,8 +2904,8 @@ extent=TIFFScanlineSize(tiff); rows_per_strip=TIFFStripSizeDefault/(extent == 0 ? 1 : (uint32) extent); rows_per_strip=16(((rows_per_strip < 16 ? 16 : rows_per_strip)+1)/16); - TIFFGetField(tiff,TIFFTAG_IMAGELENGTH,&rows); - if (rows_per_strip > rows) + if ((TIFFGetField(tiff,TIFFTAG_IMAGELENGTH,&rows) == 1) && + (rows_per_strip > rows)) rows_per_strip=rows; option=GetImageOption(image_info,"tiff:rows-per-strip"); if (option != (const char ) NULL) @@ -2937,15 +2948,11 @@ static tmsize_t TIFFWritePixels(TIFF tiff,TIFFInfo tiff_info,ssize_t row, tsample_t sample,Image image) { - tmsize_t - status; - ssize_t i; - unsigned char - p, - q; + tmsize_t + status; size_t number_tiles, @@ -2957,6 +2964,10 @@ k, l; + unsigned char + p, + q; + if (TIFFIsTiled(tiff) == 0)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/tile.c ^
@@ -102,11 +102,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); read_info=CloneImageInfo(image_info); SetImageInfoBlob(read_info,(void ) NULL,0); *read_info->magick='\0';
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/tim.c ^
@@ -143,11 +143,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/tim2.c ^
@@ -60,8 +60,7 @@ #include "MagickCore/static.h" #include "MagickCore/string_.h" #include "MagickCore/module.h" - - + /* Typedef declarations / @@ -123,8 +122,7 @@ RGB24=1, RGBA16=2, } TIM2ColorEncoding; - - + / %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -142,7 +140,8 @@ % % The format of the ReadTIM2Image method is: % -% Image ReadTIM2Image(const ImageInfo image_info,ExceptionInfo exception) +% Image ReadTIM2Image(const ImageInfo image_info, +% ExceptionInfo exception) % % A description of each parameter follows: % @@ -600,13 +599,13 @@ image_info->filename); break; } - if (csm==CSM1) + if (csm == CSM1) { PixelInfo oldColormap; - oldColormap=(PixelInfo ) AcquireQuantumMemory((size_t)(image->colors)+1, - sizeof(image->colormap)); + oldColormap=(PixelInfo ) AcquireQuantumMemory((size_t)(image->colors)+ + 1,sizeof(image->colormap)); if (oldColormap == (PixelInfo ) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image_info->filename); @@ -617,7 +616,8 @@ return(status); } -static Image ReadTIM2Image(const ImageInfo image_info,ExceptionInfo exception) +static Image ReadTIM2Image(const ImageInfo image_info, + ExceptionInfo exception) { Image image; @@ -626,6 +626,7 @@ status; ssize_t + i, str_read; TIM2FileHeader @@ -636,12 +637,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -685,7 +685,7 @@ / if (file_header.image_count != 1) ThrowReaderException(CoderError,"NumberOfImagesIsNotSupported"); - for (int i=0; i < file_header.image_count; ++i) + for (i=0; i < (ssize_t) file_header.image_count; i++) { char clut_depth, @@ -780,8 +780,7 @@ break; } image=SyncNextImageInList(image); - status=SetImageProgress(image,LoadImagesTag,image->scene-1, - image->scene); + status=SetImageProgress(image,LoadImagesTag,image->scene-1,image->scene); if (status == MagickFalse) break; } @@ -790,8 +789,7 @@ return(DestroyImageList(image)); return(GetFirstImageInList(image)); } - - + / %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -825,8 +823,7 @@ (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } - - + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ttf.c ^
@@ -207,11 +207,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); image->columns=800; image->rows=480;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/txt.c ^
@@ -58,6 +58,7 @@ #include "MagickCore/list.h" #include "MagickCore/magick.h" #include "MagickCore/memory_.h" +#include "MagickCore/module.h" #include "MagickCore/monitor.h" #include "MagickCore/monitor-private.h" #include "MagickCore/option.h" @@ -66,7 +67,7 @@ #include "MagickCore/static.h" #include "MagickCore/statistic.h" #include "MagickCore/string_.h" -#include "MagickCore/module.h" +#include "MagickCore/token.h" #include "coders/txt.h" /* @@ -192,11 +193,9 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); - assert(exception != (ExceptionInfo ) NULL); - assert(exception->signature == MagickCoreSignature); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -384,53 +383,27 @@ static Image ReadTXTImage(const ImageInfo image_info,ExceptionInfo exception) { char - colorspace[MagickPathExtent], - text[MagickPathExtent]; - - double - max_value, - x_offset, - y_offset; + text[MagickPathExtent] = "\0"; Image image; - PixelInfo - pixel; - MagickBooleanType status; - QuantumAny - range; - - ssize_t - i, - x; - - Quantum - q; - ssize_t - count, - type, y; - unsigned long - depth, - height, - width; - /* Open image file. / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -438,25 +411,45 @@ image=DestroyImageList(image); return((Image ) NULL); } - (void) memset(text,0,sizeof(text)); (void) ReadBlobString(image,text); if (LocaleNCompare((char ) text,MagickTXTID,strlen(MagickTXTID)) != 0) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); - x_offset=(-1.0); - y_offset=(-1.0); - q=(Quantum ) NULL; do { - width=0; - height=0; - max_value=0.0; - colorspace='\0'; - count=(ssize_t) sscanf(text+32,"%lu,%lu,%lf,%32s",&width,&height,&max_value, - colorspace); - if ((count != 4) \|\| (width == 0) \|\| (height == 0) \|\| (max_value == 0.0)) + char + colorspace[MagickPathExtent] = "\0"; + + double + max_value = 0.0; + + QuantumAny + range = 0; + + ssize_t + count = 0, + i, + type = 0; + + unsigned long + depth = 0, + height = 0, + number_meta_channels = 0, + width = 0; + + count=(ssize_t) sscanf(text+32,"%lu,%lu,%lu,%lf,%32s",&width,&height, + &number_meta_channels,&max_value,colorspace); + if (count < 5) + { + number_meta_channels=0; + count=(ssize_t) sscanf(text+32,"%lu,%lu,%lf,%32s",&width,&height, + &max_value,colorspace); + } + if ((count < 4) \|\| (width == 0) \|\| (height == 0) \|\| (max_value == 0.0) \|\| + (number_meta_channels >= (unsigned long) (MaxPixelChannels-MetaPixelChannel))) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); image->columns=width; image->rows=height; + image->number_meta_channels=number_meta_channels; if ((max_value == 0.0) \|\| (max_value > 18446744073709551615.0)) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); for (depth=1; ((double) GetQuantumRange(depth)+1) < max_value; depth++) ; @@ -479,110 +472,63 @@ ThrowReaderException(CorruptImageError,"ImproperImageHeader"); (void) SetImageColorspace(image,(ColorspaceType) type,exception); (void) SetImageBackgroundColor(image,exception); - GetPixelInfo(image,&pixel); range=GetQuantumRange(image->depth); status=MagickTrue; for (y=0; y < (ssize_t) image->rows; y++) { - double - alpha, - black, - blue, - green, - red; + ssize_t + x; if (status == MagickFalse) break; - red=0.0; - green=0.0; - blue=0.0; - black=0.0; - alpha=0.0; for (x=0; x < (ssize_t) image->columns; x++) { + char + token[MagickPathExtent] = "\0"; + + const char + p; + + double + channels[MaxPixelChannels+2]; + + Quantum + q; + + ssize_t + n; + + / + Read one pixel per line in this format: + (x-offset,y-offset) (red,green,blue,...) #HEX #CSS + / if (ReadBlobString(image,text) == (char ) NULL) { status=MagickFalse; break; } - switch (image->colorspace) + n=0; + for (p=text; (p != ')') && (p != '\0') && (n < MaxPixelChannels); ) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/uil.c ^
@@ -205,10 +205,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/url.c ^
@@ -65,9 +65,13 @@ # endif # include <libxml/parser.h> # include <libxml/xmlmemory.h> +#if defined(LIBXML_FTP_ENABLED) # include <libxml/nanoftp.h> +#endif +#if defined(LIBXML_HTTP_ENABLED) # include <libxml/nanohttp.h> #endif +#endif #if defined(MAGICKCORE_WINDOWS_SUPPORT) && \ !defined(__MINGW32__) # include <urlmon.h>
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/uyvy.c ^
@@ -122,11 +122,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -315,7 +315,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((image->columns % 2) != 0) image->columns++;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/vicar.c ^
@@ -183,11 +183,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -461,10 +461,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/vid.c ^
@@ -134,11 +134,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); list=(char ) AcquireMagickMemory(sizeof(filelist)); if (list == (char *) NULL) @@ -164,7 +164,7 @@ (void) CloneString(&read_info->size,DefaultTileGeometry); for (i=0; i < (ssize_t) number_files; i++) { - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(),"name: %s", filelist[i]); if (LocaleNCompare(filelist[i],"VID:",4) == 0) @@ -182,7 +182,7 @@ (void) SetImageProperty(next_image,"label",label,exception); label=DestroyString(label); } - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), "geometry: %.20gx%.20g",(double) next_image->columns,(double) next_image->rows); @@ -196,7 +196,7 @@ next_image=DestroyImage(next_image); next_image=thumbnail_image; } - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), "thumbnail geometry: %.20gx%.20g",(double) next_image->columns,(double) next_image->rows); @@ -216,7 +216,7 @@ Create the visual image directory. / montage_info=CloneMontageInfo(image_info,(MontageInfo *) NULL); - if (image_info->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(),"creating montage"); montage_image=MontageImageList(image_info,montage_info, GetFirstImageInList(images),exception);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/video.c ^
@@ -189,11 +189,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -580,10 +580,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); / Write intermediate files. */
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/viff.c ^
@@ -259,11 +259,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -982,10 +982,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/vips.c ^
@@ -392,11 +392,11 @@ assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -642,7 +642,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/wbmp.c ^
@@ -147,11 +147,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -374,10 +374,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/webp.c ^
@@ -537,11 +537,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1137,7 +1137,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if ((image->columns > 16383UL) \|\| (image->rows > 16383UL)) ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/wmf.c ^
@@ -1223,24 +1223,27 @@ util_set_brush(API, polypolygon->dc, BrushApplyFill); DrawPathStart(WmfDrawingWand); - for (polygon = 0; polygon < polypolygon->npoly; polygon++) + if (polypolygon->pt && polypolygon->count) { - polyline.dc = polypolygon->dc; - polyline.pt = polypolygon->pt[polygon]; - polyline.count = polypolygon->count[polygon]; - if ((polyline.count > 2) && polyline.pt) - { - DrawPathMoveToAbsolute(WmfDrawingWand, - XC(polyline.pt[0].x), - YC(polyline.pt[0].y)); - for (point = 1; point < polyline.count; point++) - { - DrawPathLineToAbsolute(WmfDrawingWand, - XC(polyline.pt[point].x), - YC(polyline.pt[point].y)); - } - DrawPathClose(WmfDrawingWand); - } + for (polygon = 0; polygon < polypolygon->npoly; polygon++) + { + polyline.dc = polypolygon->dc; + polyline.pt = polypolygon->pt[polygon]; + polyline.count = polypolygon->count[polygon]; + if ((polyline.count > 2) && polyline.pt) + { + DrawPathMoveToAbsolute(WmfDrawingWand, + XC(polyline.pt[0].x), + YC(polyline.pt[0].y)); + for (point = 1; point < polyline.count; point++) + { + DrawPathLineToAbsolute(WmfDrawingWand, + XC(polyline.pt[point].x), + YC(polyline.pt[point].y)); + } + DrawPathClose(WmfDrawingWand); + } + } } DrawPathFinish(WmfDrawingWand);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/xbm.c ^
@@ -219,11 +219,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -531,10 +531,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (image->debug != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/xc.c ^
@@ -114,11 +114,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if (image->columns == 0) image->columns=1;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/xcf.c ^
@@ -390,7 +390,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); assert(max != 0); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); length=ReadBlobMSBLong(image); for (i=0; i < (ssize_t) MagickMin(length,max-1); i++) @@ -536,6 +536,7 @@ if (xcfdata == (unsigned char ) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); + (void) memset(xcfdata,0,(size_t) data_lengthsizeof(xcfdata)); xcfodata=xcfdata; count=ReadBlob(image, (size_t) data_length, xcfdata); xcfdatalimit = xcfodata+count-1; @@ -560,12 +561,14 @@ { if (xcfdata >= xcfdatalimit) goto bogus_rle; - length=(size_t) ((xcfdata << 8) + xcfdata[1]); + length=(size_t) ((xcfdata << 8) + xcfdata[1]) & 0xffff; xcfdata+=2; } size-=length; if (size < 0) goto bogus_rle; + if ((length < 1) \|\| (length > data_length)) + goto bogus_rle; if (&xcfdata[length-1] > xcfdatalimit) goto bogus_rle; while (length-- > 0) @@ -615,7 +618,7 @@ { if (xcfdata >= xcfdatalimit) goto bogus_rle; - length=(size_t) ((xcfdata << 8) + xcfdata[1]); + length=(size_t) ((xcfdata << 8) + xcfdata[1]) & 0xffff; xcfdata+=2; } size-=length; @@ -1165,11 +1168,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/xpm.c ^
@@ -299,11 +299,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -719,10 +719,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status); @@ -977,10 +977,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (image->debug != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/xps.c ^
@@ -181,11 +181,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -320,21 +320,6 @@ for (i=1; ; i++) { (void) InterpretImageFilename(image_info,image,filename,(int) i, - read_info->filename,exception); - if (IsGhostscriptRendered(read_info->filename) == MagickFalse) - break; - read_info->blob=NULL; - read_info->length=0; - next=ReadImage(read_info,exception); - (void) RelinquishUniqueFileResource(read_info->filename); - if (next == (Image ) NULL) - break; - AppendImageToList(&postscript_image,next); - } - else - for (i=1; ; i++) - { - (void) InterpretImageFilename(image_info,image,filename,(int) i, read_info->filename,exception); if (IsGhostscriptRendered(read_info->filename) == MagickFalse) break;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/xwd.c ^
@@ -207,11 +207,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -794,10 +794,10 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status);
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/yaml.c ^
@@ -329,7 +329,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); channel_statistics=(ChannelStatistics ) AcquireQuantumMemory( MaxPixelChannels+1,sizeof(channel_statistics)); @@ -963,7 +963,7 @@ assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); format='\0'; elapsed_time=GetElapsedTime(&image->timer); @@ -1700,7 +1700,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=OpenBlob(image_info,image,WriteBlobMode,exception); if (status == MagickFalse)
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/ycbcr.c ^
@@ -136,11 +136,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -1101,7 +1101,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image_info->interlace != PartitionInterlace) {
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/coders/yuv.c ^
@@ -136,11 +136,11 @@ / assert(image_info != (const ImageInfo ) NULL); assert(image_info->signature == MagickCoreSignature); - if (image_info->debug != MagickFalse) - (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", - image_info->filename); assert(exception != (ExceptionInfo ) NULL); assert(exception->signature == MagickCoreSignature); + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", + image_info->filename); image=AcquireImage(image_info,exception); if ((image->columns == 0) \|\| (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); @@ -646,7 +646,7 @@ assert(image_info->signature == MagickCoreSignature); assert(image != (Image ) NULL); assert(image->signature == MagickCoreSignature); - if (image->debug != MagickFalse) + if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); quantum=(size_t) (image->depth <= 8 ? 1 : 2); interlace=image->interlace;
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/config/config.h.in ^
@@ -209,6 +209,9 @@ /* Define to 1 if you have the `getdtablesize' function. / #undef HAVE_GETDTABLESIZE +/ Define to 1 if you have the `getentropy' function. / +#undef HAVE_GETENTROPY + / Define to 1 if you have the `getexecname' function. */ #undef HAVE_GETEXECNAME
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/config/configure.xml.in ^
@@ -15,7 +15,7 @@ <configure name="CODER_PATH" value="@CODER_PATH@"/> <configure name="CONFIGURE_PATH" value="@CONFIGURE_PATH@"/> <configure name="CONFIGURE" value="@CONFIGURE_ARGS@"/> - <configure name="COPYRIGHT" value="Copyright (C) 1999-2021 ImageMagick Studio LLC"/> + <configure name="COPYRIGHT" value="Copyright (C) 1999 ImageMagick Studio LLC"/> <configure name="CPPFLAGS" value="@MAGICK_CPPFLAGS@"/> <configure name="CXXFLAGS" value="@CXXFLAGS@"/> <configure name="CXX" value="@CXX@"/>
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/config/delegates.xml.in ^
@@ -47,6 +47,7 @@ %w image columns (width) %x input image x resolution %y input image y resolution + %Q input image compression quality Set option delegate:bimodal=true to process bimodal delegates otherwise they are ignored. @@ -62,19 +63,15 @@ <delegate decode="png" encode="bpg" command=""@BPGEncodeDelegate@" -b 12 -q "%~" -o "%o" "%i""/> <delegate decode="blender" command=""@BlenderDecodeDelegate@" -b "%i" -F PNG -o "%o""\n"@ConvertDelegate@" convert -concatenate "%o*.png" "%o""/> <delegate decode="browse" stealth="True" spawn="True" command=""@BrowseDelegate@" https://imagemagick.org/; @RMDelegate@ "%i""/> - <delegate decode="cdr" command=""@UniconvertorDelegate@" "%i" "%o.svg"; @MVDelegate@ "%o.svg" "%o""/> - <delegate decode="cgm" command=""@UniconvertorDelegate@" "%i" "%o.svg"; @MVDelegate@ "%o.svg" "%o""/> <delegate decode="https:decode" command=""@WWWDecodeDelegate@" -s -k -L -o "%u.dat" "https:%M""/> <delegate decode="doc" command=""@DOCDecodeDelegate@" --headless --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; @MVDelegate@ "%i.pdf" "%o""/> <delegate decode="docx" command=""@DOCDecodeDelegate@" --headless --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; @MVDelegate@ "%i.pdf" "%o""/> <delegate decode="dng:decode" command=""@DNGDecodeDelegate@" --silent --create-id=also --out-type=png --out-depth=16 "--output=%u.png" "%i""/> <delegate decode="dot" command=""@GVCDecodeDelegate@" -Tsvg "%i" -o "%o"" /> <delegate decode="dvi" command=""@DVIDecodeDelegate@" -sstdout=%%stderr -o "%o" "%i""/> - <delegate decode="dxf" command=""@UniconvertorDelegate@" "%i" "%o.svg"; @MVDelegate@ "%o.svg" "%o""/> <delegate decode="edit" stealth="True" command=""@EditorDelegate@" -title "Edit Image Comment" -e vi "%o""/> <delegate decode="eps" encode="pdf" mode="bi" command=""@PSDelegate@" -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 "-sDEVICE=@GSPDFDevice@" "-sOutputFile=%o" "-f%i""/> <delegate decode="eps" encode="ps" mode="bi" command=""@PSDelegate@" -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@GSPSDevice@" "-sOutputFile=%o" "-f%i""/> - <delegate decode="fig" command=""@UniconvertorDelegate@" "%i" "%o.svg"; @MVDelegate@ "%o.svg" "%o""/> <delegate decode="hpg" command=""@HPGLDecodeDelegate@" -sstdout=%%stderr -m eps -f `basename "%o"` "%i"; @MVDelegate@ -f `basename "%o"` "%o""/> <delegate decode="hpgl" command=""@HPGLDecodeDelegate@" -sstdout=%%stderr -m eps -f `basename "%o"` "%i"; @MVDelegate@ -f `basename "%o"` "%o""/> <delegate decode="htm" command=""@HTMLDecodeDelegate@" -U -o "%o" "%i""/> @@ -92,7 +89,7 @@ <delegate decode="pdf" encode="eps" mode="bi" command=""@PSDelegate@" -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@GSEPSDevice@" "-sPDFPassword=%a" "-sOutputFile=%o" "-f%i""/> <delegate decode="pdf" encode="ps" mode="bi" command=""@PSDelegate@" -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@GSPSDevice@" "-sPDFPassword=%a" "-sOutputFile=%o" "-f%i""/> <delegate decode="pnm" encode="trace" command=""@TraceEncodeDelegate@" --svg --output "%o" "%i""/> - <delegate decode="png" encode="webp" command=""@WebPEncodeDelegate@" -quiet %Q "%i" -o "%o""/> + <delegate decode="png" encode="webp" command=""@WebPEncodeDelegate@" -quiet -q %Q "%i" -o "%o""/> <delegate decode="pnm" encode="ilbm" mode="encode" command=""@ILBMEncodeDelegate@" -24if "%i" > "%o""/> <delegate decode="bmp" encode="jxr" command="@MVDelegate@ "%i" "%i.bmp"; "@JXREncodeDelegate@" -i "%i.bmp" -o "%o.jxr"; @MVDelegate@ "%i.bmp" "%i"; @MVDelegate@ "%o.jxr" "%o""/> <delegate decode="bmp" encode="wdp" command="@MVDelegate@ "%i" "%i.bmp"; "@JXREncodeDelegate@" -i "%i.bmp" -o "%o.jxr"; @MVDelegate@ "%i.bmp" "%i"; @MVDelegate@ "%o.jxr" "%o""/>
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/config/ltmain.sh ^
@@ -2124,7 +2124,7 @@ # a configuration failure hint, and exit. func_fatal_configuration () { - func_fatal_error ${1+"$@"} \ + func__fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -2415,17 +2415,10 @@ # preserve --debug test : = "$debug_cmd" \|\| func_append preserve_args " --debug" - case $host in - # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 - # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 - cygwin \| mingw \| pw32 \| cegcc \| solaris2 \| os2) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - ) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac + # Keeping compiler generated duplicates in $postdeps and $predeps is not + # harmful, and is necessary in a majority of systems that use it to satisfy + # symbol dependencies. + opt_duplicate_compiler_generated_deps=: $opt_help \|\| { # Sanity checks first: @@ -7272,12 +7265,10 @@ # -tp= Portland pgcc target processor selection # --sysroot=* for sysroot support # -O, -g, -flto, -fwhopr, -fuse-linker-plugin GCC link-time optimization - # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang -64\|-mips[0-9]\|-r[0-9][0-9]\|-xarch=\|-xtarget=\|+DA\|+DD\|-q\|-m\| \ -t[45]\|-txscale\|-p\|-pg\|--coverage\|-fprofile-\|-F\|@\|-tp=\|--sysroot=\| \ - -O\|-g\|-flto\|-fwhopr\|-fuse-linker-plugin\|-fstack-protector\|-stdlib=\| \ - -specs=) + -O\|-g\|-flto\|-fwhopr\|-fuse-linker-plugin\|-fstack-protector\|-stdlib=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg"
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/config/policy.xml ^
@@ -77,6 +77,6 @@ <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> --> <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> --> <!-- <policy domain="system" name="shred" value="2"/> --> - <!-- <policy domain="system" name="precision" value="6"/> --> <!-- <policy domain="system" name="font" value="/path/to/unicode-font.ttf"/> --> + <policy domain="system" name="precision" value="6"/> </policymap>
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.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-27. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.1.0-33. # # 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-27' -PACKAGE_STRING='ImageMagick 7.1.0-27' +PACKAGE_VERSION='7.1.0-33' +PACKAGE_STRING='ImageMagick 7.1.0-33' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='https://imagemagick.org' @@ -1859,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-27 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.1.0-33 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1935,7 +1935,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of ImageMagick 7.1.0-27:";; + short \| recursive ) echo "Configuration of ImageMagick 7.1.0-33:";; esac cat <<\_ACEOF @@ -2232,7 +2232,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.1.0-27 +ImageMagick configure 7.1.0-33 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3283,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-27, which was +It was created by ImageMagick $as_me 7.1.0-33, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4271,7 +4271,7 @@ # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.1.0-27' + VERSION='7.1.0-33' # Some tools Automake needs. @@ -4511,7 +4511,7 @@ fi AM_BACKSLASH='\' -CONFIGURE_DEPENDENCIES="$CONFIGURE_DEPENDENCIES \$(top_srcdir)/ChangeLog.md \$(top_srcdir)/m4/version.m4" +CONFIGURE_DEPENDENCIES="$CONFIGURE_DEPENDENCIES \$(top_srcdir)/m4/version.m4" # @@ -4564,11 +4564,11 @@ MAGICK_MICRO_VERSION=0 -MAGICK_PATCHLEVEL_VERSION=27 +MAGICK_PATCHLEVEL_VERSION=33 -MAGICK_VERSION=7.1.0-27 +MAGICK_VERSION=7.1.0-33 -MAGICK_GIT_REVISION=19771:ccf788bd7:20220302 +MAGICK_GIT_REVISION=4e6f7b1ee:20220507 # Substitute library versioning @@ -4590,15 +4590,19 @@ PACKAGE_BASE_VERSION=7.1.0 -PACKAGE_PATCHLEVEL_VERSION=27 +PACKAGE_PATCHLEVEL_VERSION=33 -PACKAGE_VERSION_ADDENDUM=-27 +if test "n" = 'y'; then + PACKAGE_VERSION_ADDENDUM='-33 beta' +else + PACKAGE_VERSION_ADDENDUM=-33 +fi PACKAGE_LIB_VERSION=0x710 -PACKAGE_LIB_VERSION_NUMBER=7,1,0,27 +PACKAGE_LIB_VERSION_NUMBER=7,1,0,33 -PACKAGE_RELEASE_DATE=2022-02-26 +PACKAGE_RELEASE_DATE=2022-05-07 # Ensure that make can run correctly @@ -30359,19 +30363,19 @@ $as_echo "-------------------------------------------------------------" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libheif" >&5 -$as_echo_n "checking for libheif... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libheif >= 1.4.0" >&5 +$as_echo_n "checking for libheif >= 1.4.0... " >&6; } if test -n "$HEIF_CFLAGS"; then pkg_cv_HEIF_CFLAGS="$HEIF_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libheif\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libheif") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libheif >= 1.4.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libheif >= 1.4.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_HEIF_CFLAGS=`$PKG_CONFIG --cflags "libheif" 2>/dev/null` + pkg_cv_HEIF_CFLAGS=`$PKG_CONFIG --cflags "libheif >= 1.4.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -30383,12 +30387,12 @@ pkg_cv_HEIF_LIBS="$HEIF_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libheif\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libheif") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libheif >= 1.4.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libheif >= 1.4.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_HEIF_LIBS=`$PKG_CONFIG --libs "libheif" 2>/dev/null` + pkg_cv_HEIF_LIBS=`$PKG_CONFIG --libs "libheif >= 1.4.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -30409,9 +30413,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - HEIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libheif" 2>&1` + HEIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libheif >= 1.4.0" 2>&1` else - HEIF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libheif" 2>&1` + HEIF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libheif >= 1.4.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$HEIF_PKG_ERRORS" >&5 @@ -32840,7 +32844,7 @@ # Check for functions # -for ac_func in acosh _aligned_malloc aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getpwnam_r getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkdir mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread putenv pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strcasestr strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp system telldir tempnam times ulltostr uselocale usleep utime utimensat vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat +for ac_func in acosh _aligned_malloc aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getentropy getexecname getdtablesize getpagesize getpid getpwnam_r getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkdir mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread putenv pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strcasestr strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp system telldir tempnam times ulltostr uselocale usleep utime utimensat vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -36796,7 +36800,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ImageMagick $as_me 7.1.0-27, which was +This file was extended by ImageMagick $as_me 7.1.0-33, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -36863,7 +36867,7 @@ cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ImageMagick config.status 7.1.0-27 +ImageMagick config.status 7.1.0-33 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/configure.ac ^
@@ -31,14 +31,13 @@ [magick_major_version,magick_minor_version,magick_micro_version,magick_patchlevel_version]) m4_define([magick_git_revision], m4_esyscmd([ - c=$(git log --full-history --format=tformat:. HEAD \| wc -l) h=$(git rev-parse --short HEAD) - d=$(date -u +%Y%m%d) - printf %s "$c:$h:$d" + d=$(git log -1 --format=:%cd --date=format:%Y%m%d \|\| date -u +%Y%m%d -r ./m4/version.m4) + printf %s "$h$d" ])) m4_define([magick_release_date], m4_esyscmd([ - d=$(date -u +%F -r ./ChangeLog.md) + d=$(git log -1 --format=%cd --date=format:%Y-%m-%d \|\| date -u +%F -r ./m4/version.m4) printf %s "$d" ])) @@ -60,7 +59,7 @@ AM_INIT_AUTOMAKE([foreign no-define color-tests parallel-tests -Wall -Wno-portability subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip tar-ustar]) AM_SILENT_RULES([yes]) -AC_SUBST([CONFIGURE_DEPENDENCIES],["$CONFIGURE_DEPENDENCIES \$(top_srcdir)/ChangeLog.md \$(top_srcdir)/m4/version.m4"]) +AC_SUBST([CONFIGURE_DEPENDENCIES],["$CONFIGURE_DEPENDENCIES \$(top_srcdir)/m4/version.m4"]) # # Save initial user-tunable values @@ -120,7 +119,12 @@ AC_SUBST([PACKAGE_BASE_VERSION],[magick_base_version]) AC_SUBST([PACKAGE_PATCHLEVEL_VERSION],[magick_patchlevel_version]) -AC_SUBST([PACKAGE_VERSION_ADDENDUM],[-magick_patchlevel_version]) +if test "magick_is_beta" = 'y'; then + PACKAGE_VERSION_ADDENDUM='-magick_patchlevel_version beta' +else + PACKAGE_VERSION_ADDENDUM=-magick_patchlevel_version +fi +AC_SUBST([PACKAGE_VERSION_ADDENDUM]) AC_SUBST([PACKAGE_LIB_VERSION],[magick_lib_version]) AC_SUBST([PACKAGE_LIB_VERSION_NUMBER],[magick_lib_version_number]) AC_SUBST([PACKAGE_RELEASE_DATE],[magick_release_date]) @@ -2262,7 +2266,7 @@ HEIF_PKG="" if test "x$with_heic" = "xyes"; then AC_MSG_RESULT([-------------------------------------------------------------]) - PKG_CHECK_MODULES([HEIF],[libheif],[have_heic=yes],[have_heic=no]) + PKG_CHECK_MODULES([HEIF],[libheif >= 1.4.0],[have_heic=yes],[have_heic=no]) AC_MSG_RESULT([]) fi @@ -2941,7 +2945,7 @@ # Check for functions # -AC_CHECK_FUNCS([acosh _aligned_malloc aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getpwnam_r getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkdir mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread putenv pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strcasestr strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp system telldir tempnam times ulltostr uselocale usleep utime utimensat vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat]) +AC_CHECK_FUNCS([acosh _aligned_malloc aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getentropy getexecname getdtablesize getpagesize getpid getpwnam_r getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkdir mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread putenv pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strcasestr strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp system telldir tempnam times ulltostr uselocale usleep utime utimensat vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat]) # Substitute compiler name to build/link PerlMagick #
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/m4/version.m4 ^
@@ -27,7 +27,8 @@ m4_define([magick_major_version], [7]) m4_define([magick_minor_version], [1]) m4_define([magick_micro_version], [0]) -m4_define([magick_patchlevel_version], [27]) +m4_define([magick_patchlevel_version], [33]) +m4_define([magick_is_beta], [n]) 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.33+obs1.0.tar.xz/upstream/utilities/compare.1 ^
@@ -66,6 +66,7 @@ virtual pixel access method Image Operators: + \-auto-orient automatically orient image \-brightness-contrast geometry improve brightness / contrast of the image \-distort method args
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/utilities/compare.1.in ^
@@ -66,6 +66,7 @@ virtual pixel access method Image Operators: + \-auto-orient automatically orient image \-brightness-contrast geometry improve brightness / contrast of the image \-distort method args
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/utilities/magick.c ^
@@ -17,7 +17,7 @@ % January 2012 % % % % % -% Copyright 1999-2021 ImageMagick Studio LLC, a non-profit organization % +% Copyright 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may %
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/www/command-line-options.html ^
@@ -6092,7 +6092,7 @@ filter.</p> <p>Many image processing algorithms assume your image is in a linear-light -coding. If your image is gamma-corrected, you can remove the nonlinear gamma +coding. If your image is gamma-corrected, you can remove the non-linear gamma correction, apply the transform, then restore it like this:</p> <pre class="bg-light text-dark mx-4"><samp>magick portrait.jpg -gamma .45455 -resize 25% -gamma 2.2 \
[-] [+]	Changed	_service:tar_git:ImageMagick-7.1.0.33+obs1.0.tar.xz/upstream/www/news.html ^
@@ -119,7 +119,7 @@ <li>reduce lock contention with the <a href="http://goog-perftools.sourceforge.net/doc/tcmalloc.html">tcmalloc</a> memory allocation library;</li> <li>push large images to a solid-state drive, see <a href="../www/architecture.html#tera-pixel">large image support</a>.</li> </ul> -<p>If these options are prohibitive, you can reduce the quality of the image results. The default build is Q16 HDRI. If you disable <a href="high-dynamic-range.html">HDRI</a>, you use half the memory and instead of predominately floating point operations, you use the typically more efficient integer operations. The trade-off is reduced precision and you cannot process out of range pixel values (e.g. negative). If you build the Q8 non-HDRI version of ImageMagick, you again reduce the memory requirements in half-- and once again there is a trade-off, even less precision and no out of range pixel values. For a Q8 non-HDRI build of ImageMagick, use these <samp>configure</samp> script options: <samp>--with-quantum-depth=8 --disable-hdri</samp>.</p> +<p>If these options are prohibitive, you can reduce the quality of the image results. The default build is Q16 HDRI. If you disable <a href="high-dynamic-range.html">HDRI</a>, you use half the memory and instead of predominantly floating point operations, you use the typically more efficient integer operations. The trade-off is reduced precision and you cannot process out of range pixel values (e.g. negative). If you build the Q8 non-HDRI version of ImageMagick, you again reduce the memory requirements in half-- and once again there is a trade-off, even less precision and no out of range pixel values. For a Q8 non-HDRI build of ImageMagick, use these <samp>configure</samp> script options: <samp>--with-quantum-depth=8 --disable-hdri</samp>.</p> <h2><a class="anchor" id="community"></a>Community</h2> <p>To join the ImageMagick community, try the <a target="_blank" href="https://github.com/ImageMagick/ImageMagick/discussions">discussion</a> service. You can review questions or comments (with informed responses) posed by ImageMagick users or ask your own questions. If you want to contribute image processing algorithms, other enhancements, or bug fixes, open an <a href="https://github.com/ImageMagick/ImageMagick/issues">issue</a>. </p>
[-] [+]	Changed	_service:tar_git:ImageMagick.yaml ^
@@ -1,8 +1,8 @@ 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.27 -Release: 1.2 +Version: 7.1.0.33 +Release: 1.1 Summary: Viewer and Converter for Images Group: Applications/Multimedia License: ImageMagick @@ -12,7 +12,7 @@ - "%{name}-%{version}.tar.xz" Macros: #- 'debug_build;0' - - 'mfr_revision;27' + - 'mfr_revision;33' - 'maj;7' - 'mfr_version;%{maj}.1.0' - 'quantum_depth;16'