Show
Ignore:
Timestamp:
03/05/07 23:29:44 (5 years ago)
Author:
DRK
Message:

* Updated everything in cairo so that it compiles in the latest version of DMD. Also re-ran all the snippets, demos and tutorials, and checked that they worked.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/cairo/cairooo/all.d

    r119 r179  
    7373module cairooo.all; 
    7474 
    75 import cairooo.cairo; 
    76 import cairooo.callbacks; 
    77 import cairooo.context; 
    78 import cairooo.enums; 
    79 import cairooo.exceptions; 
    80 import cairooo.fontextents; 
    81 import cairooo.fontface; 
    82 import cairooo.fontoptions; 
    83 import cairooo.glyph; 
    84 import cairooo.gradient; 
    85 import cairooo.imagebuffersurface; 
    86 import cairooo.imagesurface; 
    87 import cairooo.lineargradient; 
    88 import cairooo.matrix; 
    89 import cairooo.path; 
    90 import cairooo.pattern; 
    91 import cairooo.radialgradient; 
    92 import cairooo.scaledfont; 
    93 import cairooo.solidpattern; 
    94 import cairooo.surface; 
    95 import cairooo.surfacepattern; 
    96 import cairooo.textextents; 
     75public 
     76
     77    import cairooo.cairo; 
     78    import cairooo.callbacks; 
     79    import cairooo.context; 
     80    import cairooo.enums; 
     81    import cairooo.exceptions; 
     82    import cairooo.fontextents; 
     83    import cairooo.fontface; 
     84    import cairooo.fontoptions; 
     85    import cairooo.glyph; 
     86    import cairooo.gradient; 
     87    import cairooo.imagebuffersurface; 
     88    import cairooo.imagesurface; 
     89    import cairooo.lineargradient; 
     90    import cairooo.matrix; 
     91    import cairooo.path; 
     92    import cairooo.pattern; 
     93    import cairooo.radialgradient; 
     94    import cairooo.scaledfont; 
     95    import cairooo.solidpattern; 
     96    import cairooo.surface; 
     97    import cairooo.surfacepattern; 
     98    import cairooo.textextents; 
     99
    97100 
  • trunk/cairo/cairooo/context.d

    r119 r179  
    318318    { 
    319319        scope(success) checkStatus(); 
    320         cairo_set_dash(this.handle, dashes, dashes.length, offset); 
     320        cairo_set_dash(this.handle, dashes.ptr, dashes.length, offset); 
    321321    } 
    322322 
     
    852852    { 
    853853        scope(success) checkStatus(); 
    854         cairo_glyph_path(this.handle, cast(cairo_glyph_t*) glyphs
     854        cairo_glyph_path(this.handle, cast(cairo_glyph_t*) glyphs.ptr
    855855                glyphs.length); 
    856856    } 
     
    11271127    { 
    11281128        scope(success) checkStatus(); 
    1129         cairo_show_glyphs(this.handle, cast(cairo_glyph_t*) glyphs
     1129        cairo_show_glyphs(this.handle, cast(cairo_glyph_t*) glyphs.ptr
    11301130                glyphs.length); 
    11311131    } 
     
    11741174        scope(success) checkStatus(); 
    11751175        TextExtents result; 
    1176         cairo_glyph_extents(this.handle, cast(cairo_glyph_t*) glyphs
     1176        cairo_glyph_extents(this.handle, cast(cairo_glyph_t*) glyphs.ptr
    11771177                glyphs.length, cast(cairo_text_extents_t*) &result); 
    11781178        return result; 
  • trunk/cairo/cairooo/exceptions.d

    r119 r179  
    4545} 
    4646 
    47 package void 
     47void 
    4848checkStatus(cairo_status_t status) 
    4949{ 
  • trunk/cairo/cairooo/extra/all.d

    r119 r179  
    3939module cairooo.extra.all; 
    4040 
    41 import cairooo.extra.shapetemplate; 
    42 import cairooo.extra.types; 
     41public 
     42
     43    import cairooo.extra.shapetemplate; 
     44    import cairooo.extra.types; 
     45
    4346 
  • trunk/cairo/cairooo/glitz/all.d

    r119 r179  
    3939module cairooo.glitz.all; 
    4040 
    41 import cairooo.glitz.glitz; 
    42 import cairooo.glitz.glitzsurface; 
     41public 
     42
     43    import cairooo.glitz.glitz; 
     44    import cairooo.glitz.glitzsurface; 
     45
    4346 
  • trunk/cairo/cairooo/imagebuffersurface.d

    r119 r179  
    109109        this._data = data; 
    110110        this.selfAllocated = false; 
    111         super(cairo_image_surface_create_for_data(data
     111        super(cairo_image_surface_create_for_data(data.ptr
    112112                    cast(cairo_format_t) format, width, height, stride), 
    113113                true); 
  • trunk/cairo/cairooo/matrix.d

    r119 r179  
    131131    fromPtr(cairo_matrix_t* ptr) 
    132132    { 
    133         return cast(Matrix) (*ptr); 
     133        //return cast(Matrix) (*ptr); 
     134        return *(cast(Matrix*)ptr); 
    134135    } 
    135136} 
  • trunk/cairo/cairooo/png/all.d

    r119 r179  
    3939module cairooo.png.all; 
    4040 
    41 import cairooo.png.png; 
    42 import cairooo.png.pngsurface; 
     41public 
     42
     43    import cairooo.png.png; 
     44    import cairooo.png.pngsurface; 
     45
    4346 
  • trunk/cairo/cairooo/png/pngsurface.d

    r119 r179  
    4242{ 
    4343    import std.stream; 
     44    import std.string; 
    4445    import cairo.cairo; 
    4546    import cairo.png.cairo_png; 
     
    102103    this(char[] filename) 
    103104    { 
    104         super(cairo_image_surface_create_from_png(filename), false); 
     105        super(cairo_image_surface_create_from_png( 
     106                    toStringz(filename)), false); 
    105107    } 
    106108 
     
    131133    writeToPNG(Surface surface, char[] filename) 
    132134    { 
    133         .checkStatus(cairo_surface_write_to_png(surface.handle, filename)); 
     135        .checkStatus(cairo_surface_write_to_png(surface.handle, 
     136                    toStringz(filename))); 
    134137    } 
    135138 
  • trunk/cairo/cairooo/win32/all.d

    r119 r179  
    3939module cairooo.win32.all; 
    4040 
    41 import cairooo.win32.win32; 
    42 import cairooo.win32.win32fontface; 
    43 import cairooo.win32.win32scaledfont; 
    44 import cairooo.win32.win32surface; 
     41public 
     42
     43    import cairooo.win32.win32; 
     44    import cairooo.win32.win32fontface; 
     45    import cairooo.win32.win32scaledfont; 
     46    import cairooo.win32.win32surface; 
     47
    4548 
  • trunk/cairo/cairooo/xlib/all.d

    r119 r179  
    3939module cairooo.xlib.all; 
    4040 
    41 import cairooo.xlib.xlib; 
    42 import cairooo.xlib.drawablesurface; 
    43 import cairooo.xlib.pixmapsurface; 
     41public 
     42
     43    import cairooo.xlib.xlib; 
     44    import cairooo.xlib.drawablesurface; 
     45    import cairooo.xlib.pixmapsurface; 
     46
    4447