View | Details | Raw Unified | Return to bug 201424 | Differences between
and this patch

Collapse All | Expand All

(-)cuneiform_src/cli/cuneiform-cli.cpp (-2 / +6 lines)
Lines 152-158 static string supported_formats() { Link Here
152
 */
152
 */
153
static char* read_file(const char *fname);
153
static char* read_file(const char *fname);
154
154
155
#ifdef USE_MAGICK
155
#ifndef USE_MAGICK
156
#define USE_MAGICK
156
#include <Magick++.h>
157
#include <Magick++.h>
157
using namespace Magick;
158
using namespace Magick;
158
159
Lines 337-343 int main(int argc, char **argv) { Link Here
337
        return 0;
338
        return 0;
338
    }
339
    }
339
340
340
#ifdef USE_MAGICK
341
#ifndef USE_MAGICK 
342
#define USE_MAGICK
343
#include <Magick++.h>
344
using namespace Magick;
341
    Magick::InitializeMagick("");
345
    Magick::InitializeMagick("");
342
#endif
346
#endif
343
347

Return to bug 201424