Changeset 381


Ignore:
Timestamp:
Apr 12, 2010, 2:04:46 PM (11 years ago)
Author:
dmik
Message:

jpeg plugin: Provide a better resolution of a conflict between the boolean type in jpeglib and in SOM (fixes inability to load JPEG files which is a regression of r283).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Lucide/plugins/lujpeg/lujpeg.cpp

    r367 r381  
    5555#include "lujpeg.xih"
    5656
    57 #define HAVE_BOOLEAN
    58 
    5957#include <stdio.h>
    6058#include <stdlib.h>
    6159#include <string.h>
    6260#include <setjmp.h>
     61
     62// jpeglib defines boolean as int while SOM defines it as unsigned char,
     63// work this around (note that you need to use jpeg_boolean in this source if
     64// you need to refer to the jpeglib's definition of it)
     65#define boolean jpeg_boolean
    6366#include <jpeglib.h>
     67#undef boolean
    6468
    6569
Note: See TracChangeset for help on using the changeset viewer.