Ignore:
Timestamp:
Mar 23, 2010, 2:53:39 PM (12 years ago)
Author:
dmik
Message:

branches/kmk: Made all Lucide SOM plugins build with kmk/gcc.

Location:
branches/kmk/Lucide/plugins/lupoppler
Files:
2 added
3 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • branches/kmk/Lucide/plugins/lupoppler/lupoppler.cpp

    r291 r306  
    4040
    4141#include <vector>
     42#include <algorithm>
    4243#include <time.h>
    4344#include <uconv.h>
     
    6364//#define CONV_RGB_4TO3
    6465
    65 #ifdef __GNUC__
    66 #define __min(a,b)  (((a) < (b)) ? (a) : (b))
    67 #endif
    68 
    6966typedef std::vector<LuRectangle> RectList;
    7067
     
    288285    pixbuf_rowstride = pixbuf->getRowSize( ev );
    289286
    290     width = __min( splash_width, pixbuf_width );
    291     height = __min( splash_height, pixbuf_height );
    292     rowstride = __min( splash_rowstride, pixbuf_rowstride );
     287    width = std::min( splash_width, pixbuf_width );
     288    height = std::min( splash_height, pixbuf_height );
     289    rowstride = std::min( splash_rowstride, pixbuf_rowstride );
    293290
    294291    int i, j, k, l, m;
Note: See TracChangeset for help on using the changeset viewer.