From 68995c466b4c6595c2d01a5c3a3b48ca644634dd Mon Sep 17 00:00:00 2001 From: mazze Date: Sun, 31 Aug 2014 19:55:47 +0000 Subject: [PATCH] Removed -D__MORPHOS__ from the makefiles. Enabled all debug output. git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@49567 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- vpdf/fontcache.c | 2 +- vpdf/mcc/documentview_class.c | 3 ++- vpdf/mcc/pageview_class.c | 2 +- vpdf/mcc/renderer_class.c | 6 +++++- vpdf/mcc/thumbnaillist_class.c | 2 +- vpdf/pagenumberclass.c | 6 +++++- vpdf/poppler.cpp | 10 ++++++---- vpdf/poppler/fofi/mmakefile.src | 2 +- vpdf/poppler/goo/gfile.cc | 2 +- vpdf/poppler/goo/gfile.h | 2 +- vpdf/poppler/goo/mmakefile.src | 2 +- vpdf/poppler/poppler/GlobalParams.cc | 4 ++-- vpdf/poppler/poppler/mmakefile.src | 2 +- vpdf/poppler/splash/SplashBitmap.cc | 2 +- vpdf/poppler/splash/mmakefile.src | 2 +- vpdf/printer.c | 2 +- 16 files changed, 31 insertions(+), 20 deletions(-) diff --git a/vpdf/fontcache.c b/vpdf/fontcache.c index f9e3f69f6..9584e4da9 100644 --- a/vpdf/fontcache.c +++ b/vpdf/fontcache.c @@ -29,7 +29,7 @@ static FT_Library ftLibrary; void kprintf(char *fmt,...); -#define D(x) +#define D(x) x //#define FcDebug() 0xffffffffUL #define FcDebug() 0 #define FcResultMatch TRUE diff --git a/vpdf/mcc/documentview_class.c b/vpdf/mcc/documentview_class.c index 6d9fb2b60..d5d629ffc 100644 --- a/vpdf/mcc/documentview_class.c +++ b/vpdf/mcc/documentview_class.c @@ -1,5 +1,6 @@ #if defined(__AROS__) #define MUIMASTER_YES_INLINE_STDARG +#include #endif #define SYSTEM_PRIVATE 1 @@ -88,7 +89,7 @@ struct Data }; -#define D(x) +#define D(x) x #define gFalse 0 #define ANNOTLIST_INVALID 0 #define ANNOTLIST_EMPTY ((void*)-1) diff --git a/vpdf/mcc/pageview_class.c b/vpdf/mcc/pageview_class.c index f8dc912d9..f4563a4db 100644 --- a/vpdf/mcc/pageview_class.c +++ b/vpdf/mcc/pageview_class.c @@ -111,7 +111,7 @@ struct Data struct SignalSemaphore sema; }; -#define D(x) +#define D(x) x /* * MUI Standard methods diff --git a/vpdf/mcc/renderer_class.c b/vpdf/mcc/renderer_class.c index 118ffe895..f3ecded61 100644 --- a/vpdf/mcc/renderer_class.c +++ b/vpdf/mcc/renderer_class.c @@ -30,6 +30,10 @@ #include #include +#if defined(__AROS__) +#include +#endif + #include #if defined(__MORPHOS__) @@ -72,7 +76,7 @@ struct Data #define gFalse 0 -#define D(x) +#define D(x) x //struct Library *CairoBase; //struct Library *FontConfigBase; diff --git a/vpdf/mcc/thumbnaillist_class.c b/vpdf/mcc/thumbnaillist_class.c index 6521231a7..37bb14d2c 100644 --- a/vpdf/mcc/thumbnaillist_class.c +++ b/vpdf/mcc/thumbnaillist_class.c @@ -1,6 +1,6 @@ #if defined(__AROS__) #define MUIMASTER_YES_INLINE_STDARG -#include +#include #endif #define SYSTEM_PRIVATE 1 diff --git a/vpdf/pagenumberclass.c b/vpdf/pagenumberclass.c index bf39668d7..94f918a2d 100644 --- a/vpdf/pagenumberclass.c +++ b/vpdf/pagenumberclass.c @@ -9,6 +9,10 @@ #include #include +#if defined(__AROS__) +#include +#endif + #include #include //// @@ -47,7 +51,7 @@ struct Data PageNumberItem pages_bitmap[1024]; }; -#define D(x) +#define D(x) x DEFNEW { diff --git a/vpdf/poppler.cpp b/vpdf/poppler.cpp index 14e2df2fb..0dd186478 100644 --- a/vpdf/poppler.cpp +++ b/vpdf/poppler.cpp @@ -84,7 +84,7 @@ struct abortcallbackcontext /* this is bit hacky but we can't/shouldn't use boopsi in poppler.c */ -#define D(x) +#define D(x) x extern "C" { void vpdfErrorFunction(int pos, char *message); @@ -330,15 +330,17 @@ void pdfDelete(void *_ctx) ENTER_SECTION - D(kprintf("delete output device:%p. base:%p\n", ctx->dev, CairoBase)); + + D(kprintf("delete output device:%p.\n", ctx->dev)); + if(ctx->dev != NULL) delete ctx->dev; if (ctx->selection_dev != NULL) delete ctx->selection_dev; -#ifndef USE_SPLASH - D(kprintf("delete surface:%p. base:%p\n", ctx->surface, CairoBase)); +#if !defined(USE_SPLASH) + D(kprintf("delete surface:%p.\n", ctx->surface)); if(ctx->surface != NULL) { diff --git a/vpdf/poppler/fofi/mmakefile.src b/vpdf/poppler/fofi/mmakefile.src index af2dd2965..decf0240f 100644 --- a/vpdf/poppler/fofi/mmakefile.src +++ b/vpdf/poppler/fofi/mmakefile.src @@ -13,7 +13,7 @@ FILES := FoFiBase \ TARGETDIR := $(AROS_CONTRIB)/Utilities/Text/VPDF/libs USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/.. -I$(SRCDIR)/$(CURDIR)/../poppler -USER_CFLAGS := -D__MORPHOS__ -frtti -fexceptions -fcheck-new +USER_CFLAGS := -frtti -fexceptions -fcheck-new %build_linklib mmake=contrib-vpdf-poppler-fofi libname=fofi \ cxxfiles=$(FILES) libdir=$(TARGETDIR) diff --git a/vpdf/poppler/goo/gfile.cc b/vpdf/poppler/goo/gfile.cc index c33e1c6a3..560ae81b1 100644 --- a/vpdf/poppler/goo/gfile.cc +++ b/vpdf/poppler/goo/gfile.cc @@ -641,7 +641,7 @@ GooFile* GooFile::open(const wchar_t *fileName) { return handle == INVALID_HANDLE_VALUE ? NULL : new GooFile(handle); } -#elif defined(__MORPHOS__) +#elif defined(__MORPHOS__) || defined(__AROS__) #include #include diff --git a/vpdf/poppler/goo/gfile.h b/vpdf/poppler/goo/gfile.h index 66248c73d..13fe5308e 100644 --- a/vpdf/poppler/goo/gfile.h +++ b/vpdf/poppler/goo/gfile.h @@ -144,7 +144,7 @@ private: GooFile(HANDLE handleA): handle(handleA) {} HANDLE handle; -#elif defined(__MORPHOS__) +#elif defined(__MORPHOS__) || defined(__AROS__) ~GooFile() { fclose(file); } GooFile(FILE *f, int size) : file(f), fileoffset(0), filesize(size) {} diff --git a/vpdf/poppler/goo/mmakefile.src b/vpdf/poppler/goo/mmakefile.src index 75aafc524..e7000cb41 100644 --- a/vpdf/poppler/goo/mmakefile.src +++ b/vpdf/poppler/goo/mmakefile.src @@ -20,7 +20,7 @@ FILES := gfile \ TARGETDIR := $(AROS_CONTRIB)/Utilities/Text/VPDF/libs USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/.. -I$(SRCDIR)/$(CURDIR)/../poppler -USER_CFLAGS := -D__MORPHOS__ -frtti -fexceptions -fcheck-new +USER_CFLAGS := -frtti -fexceptions -fcheck-new %build_linklib mmake=contrib-vpdf-poppler-goo libname=goo \ cxxfiles=$(FILES) libdir=$(TARGETDIR) diff --git a/vpdf/poppler/poppler/GlobalParams.cc b/vpdf/poppler/poppler/GlobalParams.cc index 9dccd9bc7..cbb19e285 100644 --- a/vpdf/poppler/poppler/GlobalParams.cc +++ b/vpdf/poppler/poppler/GlobalParams.cc @@ -272,7 +272,7 @@ public: #ifdef WIN32 void scanWindowsFonts(GooString *winFontDir); #endif -#if defined(WITH_FONTCONFIGURATION_FONTCONFIG) || defined(__MORPHOS__) +#if defined(WITH_FONTCONFIGURATION_FONTCONFIG) || defined(__MORPHOS__) || defined(__AROS__) void addFcFont(SysFontInfo *si) {fonts->append(si);} #endif private: @@ -1327,7 +1327,7 @@ fin: return path; } -#elif defined(__MORPHOS__) +#elif defined(__MORPHOS__) || defined(__AROS__) GooString *GlobalParams::findBase14FontFile(GooString *base14Name, GfxFont *font) { SysFontType type; diff --git a/vpdf/poppler/poppler/mmakefile.src b/vpdf/poppler/poppler/mmakefile.src index dbb29eb0a..d5d86e417 100644 --- a/vpdf/poppler/poppler/mmakefile.src +++ b/vpdf/poppler/poppler/mmakefile.src @@ -70,7 +70,7 @@ FILES := Annot \ TARGETDIR := $(AROS_CONTRIB)/Utilities/Text/VPDF/libs USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/.. -I$(SRCDIR)/$(CURDIR)/../goo -I$(AROS_INCLUDES)/cairo -USER_CFLAGS := -D__MORPHOS__ -frtti -fexceptions -fcheck-new +USER_CFLAGS := -frtti -fexceptions -fcheck-new %build_linklib mmake=contrib-vpdf-poppler-poppler libname=poppler \ cxxfiles=$(FILES) libdir=$(TARGETDIR) diff --git a/vpdf/poppler/splash/SplashBitmap.cc b/vpdf/poppler/splash/SplashBitmap.cc index 2c9b56999..0a2549dfc 100644 --- a/vpdf/poppler/splash/SplashBitmap.cc +++ b/vpdf/poppler/splash/SplashBitmap.cc @@ -350,7 +350,7 @@ SplashError SplashBitmap::writeImgFile(SplashImageFileFormat format, char *fileN } SplashError SplashBitmap::writeImgFile(SplashImageFileFormat format, FILE *f, int hDPI, int vDPI, const char *compressionString) { - #ifndef __MORPHOS__ + #if !defined(__MORPHOS__) && !defined(__AROS__) ImgWriter *writer; SplashError e; diff --git a/vpdf/poppler/splash/mmakefile.src b/vpdf/poppler/splash/mmakefile.src index a9b217799..28034db6f 100644 --- a/vpdf/poppler/splash/mmakefile.src +++ b/vpdf/poppler/splash/mmakefile.src @@ -27,7 +27,7 @@ FILES := Splash \ TARGETDIR := $(AROS_CONTRIB)/Utilities/Text/VPDF/libs USER_INCLUDES := -I$(SRCDIR)/$(CURDIR)/.. -I$(SRCDIR)/$(CURDIR)/../poppler -USER_CFLAGS := -D__MORPHOS__ -frtti -fexceptions -fcheck-new +USER_CFLAGS := -frtti -fexceptions -fcheck-new %build_linklib mmake=contrib-vpdf-poppler-splash libname=poppler-splash \ cxxfiles=$(FILES) libdir=$(TARGETDIR) diff --git a/vpdf/printer.c b/vpdf/printer.c index 9f96bfe3f..7ab523427 100644 --- a/vpdf/printer.c +++ b/vpdf/printer.c @@ -79,7 +79,7 @@ struct Data }; -#define D(x) +#define D(x) x void kprintf(char *fmt,...); static STRPTR oddeven[4] = {NULL}; -- 2.11.4.GIT