• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Révision9c564d99b50acc74574a3f1f0728d95dfa3e14c2 (tree)
l'heure2022-08-07 18:48:19
AuteurJaroslav Fojtik
CommiterJaroslav Fojtik

Message de Log

Reverted file "jmorecfg.h" to previous version. It contains specially tailored chunk for gm.

Change Summary

Modification

diff -r d4343d154600 -r 9c564d99b50a jpeg/jmorecfg.h
--- a/jpeg/jmorecfg.h Sun Aug 07 10:41:52 2022 +0200
+++ b/jpeg/jmorecfg.h Sun Aug 07 11:48:19 2022 +0200
@@ -247,6 +247,49 @@
247247 /* a reference to a GLOBAL function: */
248248 #define EXTERN(type) extern type
249249
250+/*
251+ * Following chunk added for GraphicsMagick
252+ */
253+#if defined(_VISUALC_)
254+# undef GLOBAL
255+# undef EXTERN
256+ //
257+ // Under VISUALC we have single threaded static libraries, or
258+ // mutli-threaded DLLs using the multithreaded runtime DLLs.
259+ //
260+# if defined(_MT) && defined(_DLL) && !defined(_JPEGDLL_) && !defined(_LIB)
261+# define _JPEGDLL_
262+# endif
263+# if defined(_JPEGDLL_)
264+# pragma warning( disable: 4273 ) /* Disable the stupid dll linkage warnings */
265+# if !defined(_JPEGLIB_)
266+ // a function referenced thru EXTERNs:
267+# define GLOBAL(type) __declspec(dllimport) type
268+ // a reference to a GLOBAL function:
269+# define EXTERN(type) extern __declspec(dllimport) type
270+# else
271+ // a function referenced thru EXTERNs:
272+# define GLOBAL(type) __declspec(dllexport) type
273+ // a reference to a GLOBAL function:
274+# define EXTERN(type) extern __declspec(dllexport) type
275+# endif
276+# else
277+ // a function referenced thru EXTERNs:
278+# define GLOBAL(type) type
279+ // a reference to a GLOBAL function:
280+# define EXTERN(type) extern type
281+# endif
282+
283+# pragma warning(disable : 4018)
284+# pragma warning(disable : 4244)
285+# pragma warning(disable : 4142)
286+
287+# ifndef INLINE
288+# define INLINE __inline /* MSVC uses __inline */
289+# endif
290+
291+#endif /* defined(_VISUALC_) */
292+
250293
251294 /* This macro is used to declare a "method", that is, a function pointer.
252295 * We want to supply prototype parameters if the compiler can cope.
Afficher sur ancien navigateur de dépôt.