GraphicsMagick: PSD: Try to avoid module loading error if psd.c ...
GraphicsMagick Commits <[email protected]> Thu, 22 Feb 2024 16:14:28 -0600
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.8978.1708640084.1744.graphicsmagick-commit@lists.sourceforge.net> |
changeset 899a48acd5bb in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=899a48acd5bb summary: PSD: Try to avoid module loading error if psd.c is compiled but EnableBrokenCoders==False. diffstat: ChangeLog | 3 +++ coders/psd.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diffs (51 lines): diff -r 5028adfce7a6 -r 899a48acd5bb ChangeLog --- a/ChangeLog Thu Feb 22 08:01:02 2024 -0600 +++ b/ChangeLog Thu Feb 22 16:14:23 2024 -0600 @@ -1,5 +1,8 @@ 2024-02-22 Bob Friesenhahn <[email protected]> + * coders/psd.c: If module gets built, but EnableBrokenCoders is + not true, then include empty registration functions. + * Makefile.am: Rename coders/acppfile.cpp to magick/acppfile.cpp and include some in-progress changes which are necessary for the build to still work. diff -r 5028adfce7a6 -r 899a48acd5bb coders/psd.c --- a/coders/psd.c Thu Feb 22 08:01:02 2024 -0600 +++ b/coders/psd.c Thu Feb 22 16:14:23 2024 -0600 @@ -1518,6 +1518,7 @@ return(image); } +#endif /* if defined(EnableBrokenCoders) && EnableBrokenCoders */ /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1544,6 +1545,7 @@ */ ModuleExport void RegisterPSDImage(void) { +#if defined(EnableBrokenCoders) && EnableBrokenCoders MagickInfo *entry; @@ -1555,6 +1557,7 @@ entry->module="PSD"; entry->coder_class=UnstableCoderClass; (void) RegisterMagickInfo(entry); +#endif /* if defined(EnableBrokenCoders) && EnableBrokenCoders */ } /* @@ -1578,8 +1581,11 @@ */ ModuleExport void UnregisterPSDImage(void) { +#if defined(EnableBrokenCoders) && EnableBrokenCoders (void) UnregisterMagickInfo("PSD"); +#endif /* if defined(EnableBrokenCoders) && EnableBrokenCoders */ } +#if defined(EnableBrokenCoders) && EnableBrokenCoders /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%