Changeset 179

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/cairo/cairo.d

    r119 r179  
    3939module cairo.cairo; 
    4040 
    41 import cairo.cairotypes; 
    42 import cairo.cairofuncs; 
     41public import cairo.cairotypes; 
     42public import cairo.cairofuncs; 
    4343 
    4444private import cairo.loader; 

  • trunk/cairo/cairo/glitz/cairo_glitz.d

    r119 r179  
    4646module cairo.glitz.cairo_glitz; 
    4747 
    48 import cairo.glitz.cairotypes_glitz; 
    49 import cairo.glitz.cairofuncs_glitz; 
     48public import cairo.glitz.cairotypes_glitz; 
     49public import cairo.glitz.cairofuncs_glitz; 
    5050 
    5151private 

  • trunk/cairo/cairo/glitz/cairotypes_glitz.d

    r119 r179  
    4242module cairo.glitz.cairotypes_glitz; 
    4343 
    44 import cairo.cairotypes; 
     44public import cairo.cairotypes; 
    4545 
    4646/* 
    …… 
    6060version(UseCustomBinding) 
    6161{ 
    62     import your.glitz.binding; 
     62    public import your.glitz.binding; 
    6363} 
    6464else 

  • trunk/cairo/cairo/loader.d

    r119 r179  
    252252    { 
    253253        auto winlib = cast(WinSharedLib)lib; 
    254         void* proc = GetProcAddress(winlib.handle, procName); 
     254        void* proc = GetProcAddress(winlib.handle, toStringz(procName)); 
    255255        if( proc == null ) 
    256256            throw new ProcNotFoundException(lib, procName); 

  • trunk/cairo/cairo/png/cairo_png.d

    r119 r179  
    4040module cairo.png.cairo_png; 
    4141 
    42 import cairo.png.cairotypes_png; 
    43 import cairo.png.cairofuncs_png; 
     42public import cairo.png.cairotypes_png; 
     43public import cairo.png.cairofuncs_png; 
    4444 
    4545private 

  • trunk/cairo/cairo/png/cairotypes_png.d

    r119 r179  
    4040module cairo.png.cairotypes_png; 
    4141 
    42 import cairo.cairotypes; 
     42public import cairo.cairotypes; 
    4343 

  • trunk/cairo/cairo/win32/cairo_win32.d

    r119 r179  
    4444module cairo.win32.cairo_win32; 
    4545 
    46 import cairo.win32.cairotypes_win32; 
    47 import cairo.win32.cairofuncs_win32; 
     46public import cairo.win32.cairotypes_win32; 
     47public import cairo.win32.cairofuncs_win32; 
    4848 
    4949private 

  • trunk/cairo/cairo/win32/cairotypes_win32.d

    r119 r179  
    4242module cairo.win32.cairotypes_win32; 
    4343 
    44 import cairo.cairotypes; 
    45 import win32.windows; 
     44public import cairo.cairotypes; 
     45public import win32.windows; 
    4646 

  • trunk/cairo/cairo/xlib/cairo_xlib.d

    r119 r179  
    4646module cairo.xlib.cairo_xlib; 
    4747 
    48 import cairo.xlib.cairotypes_xlib; 
    49 import cairo.xlib.cairofuncs_xlib; 
     48public import cairo.xlib.cairotypes_xlib; 
     49public import cairo.xlib.cairofuncs_xlib; 
    5050 
    5151private 

  • trunk/cairo/cairo/xlib/cairotypes_xlib.d

    r119 r179  
    4242module cairo.xlib.cairotypes_xlib; 
    4343 
    44 import cairo.cairotypes; 
     44public import cairo.cairotypes; 
    4545 
    4646/* 
    …… 
    6464version(UseCustomBinding) 
    6565{ 
    66     import your.xlib.binding; 
     66    public import your.xlib.binding; 
    6767} 
    6868else 

  • trunk/cairo/cairo_snippets/cairo_snippets_png.d

    r119 r179  
    9292 
    9393    // Write the results to disk. 
    94     cairo_surface_write_to_png(surface, OUTPUT_PATH.format(name)); 
     94    cairo_surface_write_to_png(surface, toStringz(OUTPUT_PATH.format(name))); 
    9595 
    9696    writefln("Done."); 

  • trunk/cairo/cairo_snippets/snippets/text_align_center.d

    r97 r179  
    55{ 
    66    import std.math; 
     7    import std.string; 
    78    import cairo.cairo; 
    89    import snippets.common; 
    …… 
    2122 
    2223    cairo_set_font_size (cr, 0.2); 
    23     cairo_text_extents (cr, utf8, &extents); 
     24    cairo_text_extents (cr, toStringz(utf8), &extents); 
    2425    x = 0.5-(extents.width/2 + extents.x_bearing); 
    2526    y = 0.5-(extents.height/2 + extents.y_bearing); 
    2627 
    2728    cairo_move_to (cr, x, y); 
    28     cairo_show_text (cr, utf8); 
     29    cairo_show_text (cr, toStringz(utf8)); 
    2930 
    3031    /* draw helping lines */ 

  • trunk/cairo/cairo_snippets/snippets/text_extents.d

    r97 r179  
    55{ 
    66    import std.math; 
     7    import std.string; 
    78    import cairo.cairo; 
    89    import snippets.common; 
    …… 
    2122 
    2223    cairo_set_font_size (cr, 0.4); 
    23     cairo_text_extents (cr, utf8, &extents); 
     24    cairo_text_extents (cr, toStringz(utf8), &extents); 
    2425 
    2526    x=0.1; 
    …… 
    2728 
    2829    cairo_move_to (cr, x,y); 
    29     cairo_show_text (cr, utf8); 
     30    cairo_show_text (cr, toStringz(utf8)); 
    3031 
    3132    /* draw helping lines */ 

  • 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 

  • trunk/cairo/util/script.d

    r119 r179  
    2626module util.script; 
    2727 
    28 import std.file; 
    29 import std.format; 
    30 import std.path; 
    31 import std.process; 
    32 import std.stdio; 
    33 import std.string; 
    34 import std.zip; 
    35 import std.c.stdio; 
     28public import std.file; 
     29public import std.format; 
     30public import std.path; 
     31public import std.process; 
     32public import std.stdio; 
     33public import std.string; 
     34public import std.zip; 
     35public import std.c.stdio; 
    3636 
    3737version(Windows) {}