Changeset 306 for branches/kmk/Lucide


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
Files:
8 added
16 deleted
8 edited

Legend:

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

    r281 r306  
    3838
    3939#include "ludjvu.xih"
    40 #ifdef __WATCOMC__
    41 #include <ddjvuapiw.h>
    42 #else
     40
    4341#include <ddjvuapi.h>
    44 #endif
    45 #ifdef __GNUC__
    46 #define __min(a,b)  (((a) < (b)) ? (a) : (b))
    47 #endif
     42
     43#include <algorithm>
    4844
    4945#define SCALE_FACTOR 0.2
     
    260256    char *src, *dst;
    261257    int i, y;
    262     int rowsize = __min( pb_rowsize, pixbuf_rowsize );
    263     int height = __min( pb_height, pixbuf_height );
     258    int rowsize = std::min( pb_rowsize, pixbuf_rowsize );
     259    int height = std::min( pb_height, pixbuf_height );
    264260    for ( y = (height-1), i = 0; i < height; y--, i++ )
    265261    {
  • branches/kmk/Lucide/plugins/ludjvu/ludjvu.def

    r217 r306  
    1 LIBRARY LUDJVU INITINSTANCE TERMINSTANCE
    2 PROTMODE
    3 
    4 IMPORTS
    5         _LuDocumentNewClass=ludoc.LuDocumentNewClass
    6 ;    _LuDocumentCClassData=ludoc.LuDocumentCClassData
    7 ;    _LuDocumentClassData=ludoc.LuDocumentClassData
    8         _LuPixbufNewClass=ludoc.LuPixbufNewClass
    9 ;    _LuPixbufClassData=ludoc.LuPixbufClassData
    10         _somParentNumResolve=som.somParentNumResolve
    11         _somBuildClass=som.somBuildClass
    12 ;       _somPrintf=som.somPrintf
     1LIBRARY ludjvu
    132
    143EXPORTS
    15   createObject
    16   getSupportedExtensions
    17   getDescription
    18   getSignatureCheck
     4    ;
     5    LuDjvuDocumentNewClass
     6    LuDjvuDocumentClassData = _LuDjvuDocumentClassData
     7    _LuDjvuDocumentClassData
     8    LuDjvuDocumentCClassData = _LuDjvuDocumentCClassData
     9    _LuDjvuDocumentCClassData
     10    ;
     11    createObject
     12    getSupportedExtensions
     13    getDescription
     14    getSignatureCheck
     15
  • branches/kmk/Lucide/plugins/ludoc/cpconv.cpp

    r156 r306  
    3333
    3434
     35#include <os2.h>
    3536#include <uconv.h>
    3637
  • branches/kmk/Lucide/plugins/ludoc/ludoc.def

    r156 r306  
    1 LIBRARY     LUDOC.DLL
     1LIBRARY ludoc
    22
    33EXPORTS
     4    ;
    45    LuDocumentNewClass
    5     LuDocumentClassData
    6     LuDocumentCClassData
     6    LuDocumentClassData = _LuDocumentClassData
    77    _LuDocumentClassData
     8    LuDocumentCClassData = _LuDocumentCClassData
    89    _LuDocumentCClassData
     10    ;
    911    LuPixbufNewClass
    10     LuPixbufClassData
    11     LuPixbufCClassData
     12    LuPixbufClassData = _LuPixbufClassData
    1213    _LuPixbufClassData
     14    LuPixbufCClassData = _LuPixbufCClassData
    1315    _LuPixbufCClassData
     16    ;
    1417    LuIndexNodeNewClass
    15     LuIndexNodeClassData
    16     LuIndexNodeCClassData
     18    LuIndexNodeClassData = _LuIndexNodeClassData
    1719    _LuIndexNodeClassData
    18     _LuIndexNodeCClassData
     20    LuIndexNodeCClassData = _LuIndexNodeCClassData
     21    ;
    1922    uniConvertSpChars
    2023    uniLigaturesLength
    2124    uniReplaceLigatures
     25
  • branches/kmk/Lucide/plugins/ludoc/lupixbuf.cpp

    r222 r306  
    5454#define INCL_DOS
    5555#include <os2.h>
     56
    5657#include <assert.h>
     58#include <algorithm>
    5759
    5860#include "lupixbuf.xih"
     
    131133{
    132134    LuPixbufData *somThis = LuPixbufGetData(somSelf);
    133     int xlen = __min( somThis->width - x, p->getWidth( ev ) ) * somThis->bpp;
    134     int ylen = __min( somThis->height - y, p->getHeight( ev ) );
     135    int xlen = std::min( somThis->width - x, p->getWidth( ev ) ) * somThis->bpp;
     136    int ylen = std::min( somThis->height - y, p->getHeight( ev ) );
    135137    int rowstribe = p->getRowSize( ev );
    136138    char *fromdt = (char *)p->getDataPtr( ev );
  • branches/kmk/Lucide/plugins/ludoc/lutypes.h

    r217 r306  
    3636#define lutypes_h
    3737
     38#ifndef __SOMIDL__
    3839#include <os2.h>
     40#endif
    3941
    4042
  • branches/kmk/Lucide/plugins/lujpeg/jpscale.cpp

    r221 r306  
    4242#include <math.h>
    4343#include <vector>
     44#include <algorithm>
    4445
    4546#include <LuPixbuf.xh>
     
    5152inline int iclamp( int i, int min, int max ) {
    5253    assert( min <= max );
    53     return __max( min, __min(i, max) );
     54    return std::max( min, std::min(i, max) );
    5455}
    5556
  • 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.