Changeset 3340 for libpipi


Ignore:
Timestamp:
Jan 13, 2009, 12:51:07 AM (11 years ago)
Author:
Sam Hocevar
Message:

Rename pipi_getpixel into pipi_get_pixels.

Location:
libpipi/trunk
Files:
44 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/examples/edd.c

    r2902 r3340  
    5050    /* Load image, convert it to grayscale, dither it with Floyd-Steinberg */
    5151    img = pipi_load(argv[1]);
    52     pipi_getpixels(img, PIPI_PIXELS_Y_F);
     52    pipi_get_pixels(img, PIPI_PIXELS_Y_F);
    5353    gauss = pipi_gaussian_blur(img, sigma);
    5454    kernel = pipi_load("ediff:fs");
  • libpipi/trunk/examples/img2rubik.c

    r2902 r3340  
    3535    pipi_image_t *dst = pipi_reduce(src, NCOLORS, mypal);
    3636
    37     pipi_pixels_t *p = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     37    pipi_pixels_t *p = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    3838    float *data = (float *)p->pixels;
    3939    w = p->w;
  • libpipi/trunk/pipi-php/php_pipi.c

    r3170 r3340  
    3030        PHP_FE(pipi_save, NULL)
    3131        PHP_FE(pipi_set_gamma, NULL)
    32         PHP_FE(pipi_getpixels, NULL)
     32        PHP_FE(pipi_get_pixels, NULL)
    3333        PHP_FE(pipi_get_image_width, NULL)
    3434        PHP_FE(pipi_get_image_height, NULL)
     
    295295}
    296296
    297 PHP_FUNCTION(pipi_getpixels) {
     297PHP_FUNCTION(pipi_get_pixels) {
    298298}
    299299
  • libpipi/trunk/pipi-php/php_pipi.h

    r3164 r3340  
    4242PHP_FUNCTION(pipi_save);
    4343PHP_FUNCTION(pipi_set_gamma);
    44 PHP_FUNCTION(pipi_getpixels);
     44PHP_FUNCTION(pipi_get_pixels);
    4545PHP_FUNCTION(pipi_get_image_width);
    4646PHP_FUNCTION(pipi_get_image_height);
  • libpipi/trunk/pipi-sharp/Picture.cs

    r2939 r3340  
    9090        [DllImport("libpipi-0.dll", CallingConvention=CallingConvention.Cdecl),
    9191         SuppressUnmanagedCodeSecurity]
    92         private static extern IntPtr pipi_getpixels(IntPtr img, int type);
     92        private static extern IntPtr pipi_get_pixels(IntPtr img, int type);
    9393        public byte[] GetPixels(int w, int h, int x, int y)
    9494        {
    9595            byte[] array = new byte[w * h * 4];
    96             IntPtr pixels = pipi_getpixels(_picture, 0);
     96            IntPtr pixels = pipi_get_pixels(_picture, 0);
    9797            PixelsStruct p;
    9898            Int64 address;
  • libpipi/trunk/pipi/analysis/histogram.c

    r3102 r3340  
    4343    if(!h) return -1;
    4444
    45     data = (uint8_t *)pipi_getpixels(img, PIPI_PIXELS_RGBA_C)->pixels;
     45    data = (uint8_t *)pipi_get_pixels(img, PIPI_PIXELS_RGBA_C)->pixels;
    4646    memset(h->a, 0, 256*(sizeof(unsigned int)));
    4747    memset(h->r, 0, 256*(sizeof(unsigned int)));
  • libpipi/trunk/pipi/analysis/measure.c

    r3102 r3340  
    4242    f2 = i2->last_modified;
    4343
    44     pipi_getpixels(i1, PIPI_PIXELS_Y_F);
    45     pipi_getpixels(i2, PIPI_PIXELS_Y_F);
     44    pipi_get_pixels(i1, PIPI_PIXELS_Y_F);
     45    pipi_get_pixels(i2, PIPI_PIXELS_Y_F);
    4646
    4747    p1 = (float *)i1->p[PIPI_PIXELS_Y_F].pixels;
  • libpipi/trunk/pipi/codec/coreimage.m

    r3136 r3340  
    9898    infos->format = [myImage bitmapFormat];
    9999
    100     pipi_pixels_t *p = pipi_getpixels(img, PIPI_PIXELS_RGBA_C);
     100    pipi_pixels_t *p = pipi_get_pixels(img, PIPI_PIXELS_RGBA_C);
    101101   
    102102    img->codec_free = pipi_free_coreimage;
     
    110110{
    111111    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
    112     pipi_pixels_t *p = pipi_getpixels(img, PIPI_PIXELS_RGBA_C);
     112    pipi_pixels_t *p = pipi_get_pixels(img, PIPI_PIXELS_RGBA_C);
    113113
    114114    int i;
  • libpipi/trunk/pipi/codec/gdi.c

    r3066 r3340  
    5454
    5555    img = pipi_new(binfo.bmiHeader.biWidth, binfo.bmiHeader.biHeight);
    56     p = pipi_getpixels(img, PIPI_PIXELS_RGBA_C);
     56    p = pipi_get_pixels(img, PIPI_PIXELS_RGBA_C);
    5757    data = p->pixels;
    5858
     
    9393    int x, y, padding;
    9494
    95     p = pipi_getpixels(img, PIPI_PIXELS_RGBA_C);
     95    p = pipi_get_pixels(img, PIPI_PIXELS_RGBA_C);
    9696    data = p->pixels;
    9797
  • libpipi/trunk/pipi/codec/gdiplus.cpp

    r3078 r3340  
    6666
    6767    pipi_image_t *img = pipi_new(b->GetWidth(), b->GetHeight());
    68     pipi_pixels_t *p = pipi_getpixels(img, PIPI_PIXELS_RGBA_C);
     68    pipi_pixels_t *p = pipi_get_pixels(img, PIPI_PIXELS_RGBA_C);
    6969    memcpy(p->pixels, bdata.Scan0, bdata.Width * bdata.Height * 4);
    7070
     
    139139    }
    140140
    141     pipi_pixels_t *p = pipi_getpixels(img, PIPI_PIXELS_RGBA_C);
     141    pipi_pixels_t *p = pipi_get_pixels(img, PIPI_PIXELS_RGBA_C);
    142142    memcpy(bdata.Scan0, p->pixels, bdata.Width * bdata.Height * 4);
    143143
  • libpipi/trunk/pipi/codec/imlib.c

    r2934 r3340  
    9999    }
    100100
    101     pipi_getpixels(img, img->codec_format);
     101    pipi_get_pixels(img, img->codec_format);
    102102    imlib_context_set_image(img->codec_priv);
    103103    imlib_save_image(name);
  • libpipi/trunk/pipi/codec/modular/jpeg.c

    r3165 r3340  
    144144    unsigned char *line = NULL;
    145145
    146     pipi_pixels_t *pixels = pipi_getpixels(img, PIPI_PIXELS_RGBA_C);
     146    pipi_pixels_t *pixels = pipi_get_pixels(img, PIPI_PIXELS_RGBA_C);
    147147
    148148    if (!pixels)
  • libpipi/trunk/pipi/codec/opencv.c

    r2902 r3340  
    9292    }
    9393
    94     pipi_getpixels(img, img->codec_format);
     94    pipi_get_pixels(img, img->codec_format);
    9595    cvSaveImage(name, img->codec_priv);
    9696
  • libpipi/trunk/pipi/codec/oric.c

    r2944 r3340  
    6565
    6666    img = pipi_new(WIDTH, HEIGHT);
    67     p = pipi_getpixels(img, PIPI_PIXELS_RGBA_C);
     67    p = pipi_get_pixels(img, PIPI_PIXELS_RGBA_C);
    6868    data = p->pixels;
    6969
     
    142142    {
    143143        tmp = pipi_resize(img, WIDTH, HEIGHT);
    144         p = pipi_getpixels(tmp, PIPI_PIXELS_RGBA_F);
     144        p = pipi_get_pixels(tmp, PIPI_PIXELS_RGBA_F);
    145145    }
    146146    else
    147         p = pipi_getpixels(img, PIPI_PIXELS_RGBA_F);
     147        p = pipi_get_pixels(img, PIPI_PIXELS_RGBA_F);
    148148    data = p->pixels;
    149149    screen = malloc(WIDTH * HEIGHT / 6);
  • libpipi/trunk/pipi/codec/sdl.c

    r2902 r3340  
    9696    }
    9797
    98     pipi_getpixels(img, img->codec_format);
     98    pipi_get_pixels(img, img->codec_format);
    9999    SDL_SaveBMP(img->codec_priv, name);
    100100
  • libpipi/trunk/pipi/combine/mean.c

    r2911 r3340  
    3838
    3939    dst = pipi_new(w, h);
    40     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     40    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    4141    dstdata = (float *)dstp->pixels;
    4242
    43     img1p = pipi_getpixels(img1, PIPI_PIXELS_RGBA_F);
     43    img1p = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_F);
    4444    img1data = (float *)img1p->pixels;
    45     img2p = pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
     45    img2p = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
    4646    img2data = (float *)img2p->pixels;
    4747
  • libpipi/trunk/pipi/combine/minmax.c

    r2911 r3340  
    3838
    3939    dst = pipi_new(w, h);
    40     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     40    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    4141    dstdata = (float *)dstp->pixels;
    4242
    43     img1p = pipi_getpixels(img1, PIPI_PIXELS_RGBA_F);
     43    img1p = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_F);
    4444    img1data = (float *)img1p->pixels;
    45     img2p = pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
     45    img2p = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
    4646    img2data = (float *)img2p->pixels;
    4747
     
    8787
    8888    dst = pipi_new(w, h);
    89     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     89    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    9090    dstdata = (float *)dstp->pixels;
    9191
    92     img1p = pipi_getpixels(img1, PIPI_PIXELS_RGBA_F);
     92    img1p = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_F);
    9393    img1data = (float *)img1p->pixels;
    94     img2p = pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
     94    img2p = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
    9595    img2data = (float *)img2p->pixels;
    9696
  • libpipi/trunk/pipi/combine/mulscreen.c

    r2911 r3340  
    3838
    3939    dst = pipi_new(w, h);
    40     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
    41     dstdata = (float *)dstp->pixels;
    42 
    43     img1p = pipi_getpixels(img1, PIPI_PIXELS_RGBA_F);
    44     img1data = (float *)img1p->pixels;
    45     img2p = pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
     40    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
     41    dstdata = (float *)dstp->pixels;
     42
     43    img1p = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_F);
     44    img1data = (float *)img1p->pixels;
     45    img2p = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
    4646    img2data = (float *)img2p->pixels;
    4747
     
    8787
    8888    dst = pipi_new(w, h);
    89     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
    90     dstdata = (float *)dstp->pixels;
    91 
    92     img1p = pipi_getpixels(img1, PIPI_PIXELS_RGBA_F);
    93     img1data = (float *)img1p->pixels;
    94     img2p = pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
     89    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
     90    dstdata = (float *)dstp->pixels;
     91
     92    img1p = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_F);
     93    img1data = (float *)img1p->pixels;
     94    img2p = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
    9595    img2data = (float *)img2p->pixels;
    9696
     
    136136
    137137    dst = pipi_new(w, h);
    138     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
    139     dstdata = (float *)dstp->pixels;
    140 
    141     img1p = pipi_getpixels(img1, PIPI_PIXELS_RGBA_F);
    142     img1data = (float *)img1p->pixels;
    143     img2p = pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
     138    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
     139    dstdata = (float *)dstp->pixels;
     140
     141    img1p = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_F);
     142    img1data = (float *)img1p->pixels;
     143    img2p = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
    144144    img2data = (float *)img2p->pixels;
    145145
     
    185185
    186186    dst = pipi_new(w, h);
    187     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
    188     dstdata = (float *)dstp->pixels;
    189 
    190     img1p = pipi_getpixels(img1, PIPI_PIXELS_RGBA_F);
    191     img1data = (float *)img1p->pixels;
    192     img2p = pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
     187    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
     188    dstdata = (float *)dstp->pixels;
     189
     190    img1p = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_F);
     191    img1data = (float *)img1p->pixels;
     192    img2p = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
    193193    img2data = (float *)img2p->pixels;
    194194
  • libpipi/trunk/pipi/combine/rgb.c

    r2911 r3340  
    3838
    3939    dst = pipi_new(w, h);
    40     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     40    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    4141    dstdata = (float *)dstp->pixels;
    4242
    43     i1p = pipi_getpixels(i1, PIPI_PIXELS_Y_F);
     43    i1p = pipi_get_pixels(i1, PIPI_PIXELS_Y_F);
    4444    i1data = (float *)i1p->pixels;
    45     i2p = pipi_getpixels(i2, PIPI_PIXELS_Y_F);
     45    i2p = pipi_get_pixels(i2, PIPI_PIXELS_Y_F);
    4646    i2data = (float *)i2p->pixels;
    47     i3p = pipi_getpixels(i3, PIPI_PIXELS_Y_F);
     47    i3p = pipi_get_pixels(i3, PIPI_PIXELS_Y_F);
    4848    i3data = (float *)i3p->pixels;
    4949
     
    7373
    7474    dst = pipi_new(w, h);
    75     dstp = pipi_getpixels(dst, PIPI_PIXELS_Y_F);
     75    dstp = pipi_get_pixels(dst, PIPI_PIXELS_Y_F);
    7676    dstdata = (float *)dstp->pixels;
    7777
    78     srcp = pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     78    srcp = pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    7979    srcdata = (float *)srcp->pixels;
    8080
     
    9797
    9898    dst = pipi_new(w, h);
    99     dstp = pipi_getpixels(dst, PIPI_PIXELS_Y_F);
     99    dstp = pipi_get_pixels(dst, PIPI_PIXELS_Y_F);
    100100    dstdata = (float *)dstp->pixels;
    101101
    102     srcp = pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     102    srcp = pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    103103    srcdata = (float *)srcp->pixels;
    104104
     
    121121
    122122    dst = pipi_new(w, h);
    123     dstp = pipi_getpixels(dst, PIPI_PIXELS_Y_F);
     123    dstp = pipi_get_pixels(dst, PIPI_PIXELS_Y_F);
    124124    dstdata = (float *)dstp->pixels;
    125125
    126     srcp = pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     126    srcp = pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    127127    srcdata = (float *)srcp->pixels;
    128128
  • libpipi/trunk/pipi/combine/subadd.c

    r2911 r3340  
    3939
    4040    dst = pipi_new(w, h);
    41     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     41    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    4242    dstdata = (float *)dstp->pixels;
    4343
    44     img1p = pipi_getpixels(img1, PIPI_PIXELS_RGBA_F);
     44    img1p = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_F);
    4545    img1data = (float *)img1p->pixels;
    46     img2p = pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
     46    img2p = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
    4747    img2data = (float *)img2p->pixels;
    4848
     
    8888
    8989    dst = pipi_new(w, h);
    90     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     90    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    9191    dstdata = (float *)dstp->pixels;
    9292
    93     img1p = pipi_getpixels(img1, PIPI_PIXELS_RGBA_F);
     93    img1p = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_F);
    9494    img1data = (float *)img1p->pixels;
    95     img2p = pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
     95    img2p = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
    9696    img2data = (float *)img2p->pixels;
    9797
     
    137137
    138138    dst = pipi_new(w, h);
    139     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     139    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    140140    dstdata = (float *)dstp->pixels;
    141141
    142     img1p = pipi_getpixels(img1, PIPI_PIXELS_RGBA_F);
     142    img1p = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_F);
    143143    img1data = (float *)img1p->pixels;
    144     img2p = pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
     144    img2p = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
    145145    img2data = (float *)img2p->pixels;
    146146
  • libpipi/trunk/pipi/context.c

    r2902 r3340  
    704704        if(ctx->nimages < 1)
    705705            return -1;
    706         pipi_getpixels(ctx->images[ctx->nimages - 1], PIPI_PIXELS_Y_F);
     706        pipi_get_pixels(ctx->images[ctx->nimages - 1], PIPI_PIXELS_Y_F);
    707707    }
    708708    else if(!strcmp(cmd, "free"))
  • libpipi/trunk/pipi/dither/dbs.c

    r2902 r3340  
    7070
    7171    src = pipi_copy(img);
    72     pipi_getpixels(src, PIPI_PIXELS_Y_F);
     72    pipi_get_pixels(src, PIPI_PIXELS_Y_F);
    7373
    7474    tmp1 = pipi_convolution(src, NN, NN, kernel);
    75     tmp1p = pipi_getpixels(tmp1, PIPI_PIXELS_Y_F);
     75    tmp1p = pipi_get_pixels(tmp1, PIPI_PIXELS_Y_F);
    7676    tmp1data = (float *)tmp1p->pixels;
    7777
    7878    dst = pipi_dither_random(src);
    79     dstp = pipi_getpixels(dst, PIPI_PIXELS_Y_F);
     79    dstp = pipi_get_pixels(dst, PIPI_PIXELS_Y_F);
    8080    dstdata = (float *)dstp->pixels;
    8181
     
    8383
    8484    tmp2 = pipi_convolution(dst, NN, NN, kernel);
    85     tmp2p = pipi_getpixels(tmp2, PIPI_PIXELS_Y_F);
     85    tmp2p = pipi_get_pixels(tmp2, PIPI_PIXELS_Y_F);
    8686    tmp2data = (float *)tmp2p->pixels;
    8787
  • libpipi/trunk/pipi/dither/ediff.c

    r2902 r3340  
    4242
    4343    dst = pipi_copy(img);
    44     dstp = pipi_getpixels(dst, PIPI_PIXELS_Y_F);
     44    dstp = pipi_get_pixels(dst, PIPI_PIXELS_Y_F);
    4545    dstdata = (float *)dstp->pixels;
    4646
    47     kerp = pipi_getpixels(ker, PIPI_PIXELS_Y_F);
     47    kerp = pipi_get_pixels(ker, PIPI_PIXELS_Y_F);
    4848    kerdata = (float *)kerp->pixels;
    4949    for(kx = 0; kx < kw; kx++)
  • libpipi/trunk/pipi/dither/ordered.c

    r2904 r3340  
    6464
    6565    dst = pipi_copy(img);
    66     dstp = pipi_getpixels(dst, PIPI_PIXELS_Y_F);
     66    dstp = pipi_get_pixels(dst, PIPI_PIXELS_Y_F);
    6767    dstdata = (float *)dstp->pixels;
    6868
    69     kernelp = pipi_getpixels(kernel, PIPI_PIXELS_Y_F);
     69    kernelp = pipi_get_pixels(kernel, PIPI_PIXELS_Y_F);
    7070    kerneldata = (float *)kernelp->pixels;
    7171
     
    113113    epsilon = 1. / (w * h + 1);
    114114
    115     srcp = pipi_getpixels(src, PIPI_PIXELS_Y_F);
     115    srcp = pipi_get_pixels(src, PIPI_PIXELS_Y_F);
    116116    srcdata = (float *)srcp->pixels;
    117117
    118118    dst = pipi_new(w, h);
    119     dstp = pipi_getpixels(dst, PIPI_PIXELS_Y_F);
     119    dstp = pipi_get_pixels(dst, PIPI_PIXELS_Y_F);
    120120    dstdata = (float *)dstp->pixels;
    121121
  • libpipi/trunk/pipi/dither/ostromoukhov.c

    r2902 r3340  
    7777
    7878    dst = pipi_copy(img);
    79     dstp = pipi_getpixels(dst, PIPI_PIXELS_Y_F);
     79    dstp = pipi_get_pixels(dst, PIPI_PIXELS_Y_F);
    8080    dstdata = (float *)dstp->pixels;
    8181
  • libpipi/trunk/pipi/dither/random.c

    r2902 r3340  
    3434
    3535    dst = pipi_copy(img);
    36     dstp = pipi_getpixels(dst, PIPI_PIXELS_Y_F);
     36    dstp = pipi_get_pixels(dst, PIPI_PIXELS_Y_F);
    3737    dstdata = (float *)dstp->pixels;
    3838
  • libpipi/trunk/pipi/filter/autocontrast.c

    r2902 r3340  
    4242    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    4343
    44     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    45                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     44    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     45                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    4646    srcdata = (float *)srcp->pixels;
    4747
     
    8181
    8282    dst = pipi_new(w, h);
    83     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    84                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     83    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     84                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    8585    dstdata = (float *)dstp->pixels;
    8686
  • libpipi/trunk/pipi/filter/blur.c

    r2904 r3340  
    164164    size = (2 * m + 1) * (2 * n + 1);
    165165
    166     srcp = FLAG_GRAY ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    167                      : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     166    srcp = FLAG_GRAY ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     167                     : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    168168    srcdata = (float *)srcp->pixels;
    169169
    170170    dst = pipi_new(w, h);
    171     dstp = FLAG_GRAY ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    172                      : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     171    dstp = FLAG_GRAY ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     172                     : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    173173    dstdata = (float *)dstp->pixels;
    174174
  • libpipi/trunk/pipi/filter/color.c

    r2902 r3340  
    3939    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    4040
    41     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    42                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
    43     srcdata = (float *)srcp->pixels;
    44 
    45     dst = pipi_new(w, h);
    46     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    47                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     41    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     42                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
     43    srcdata = (float *)srcp->pixels;
     44
     45    dst = pipi_new(w, h);
     46    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     47                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    4848    dstdata = (float *)dstp->pixels;
    4949
     
    120120    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    121121
    122     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    123                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
    124     srcdata = (float *)srcp->pixels;
    125 
    126     dst = pipi_new(w, h);
    127     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    128                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     122    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     123                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
     124    srcdata = (float *)srcp->pixels;
     125
     126    dst = pipi_new(w, h);
     127    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     128                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    129129    dstdata = (float *)dstp->pixels;
    130130
     
    211211    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    212212
    213     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    214                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
    215     srcdata = (float *)srcp->pixels;
    216 
    217     dst = pipi_new(w, h);
    218     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    219                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     213    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     214                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
     215    srcdata = (float *)srcp->pixels;
     216
     217    dst = pipi_new(w, h);
     218    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     219                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    220220    dstdata = (float *)dstp->pixels;
    221221
     
    255255    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    256256
    257     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    258                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
    259     srcdata = (float *)srcp->pixels;
    260 
    261     dst = pipi_new(w, h);
    262     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    263                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     257    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     258                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
     259    srcdata = (float *)srcp->pixels;
     260
     261    dst = pipi_new(w, h);
     262    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     263                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    264264    dstdata = (float *)dstp->pixels;
    265265
  • libpipi/trunk/pipi/filter/convolution.c

    r2902 r3340  
    122122    h = src->h;
    123123
    124     srcp = FLAG_GRAY ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    125                      : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     124    srcp = FLAG_GRAY ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     125                     : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    126126    srcdata = (float *)srcp->pixels;
    127127
    128128    dst = pipi_new(w, h);
    129     dstp = FLAG_GRAY ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    130                      : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     129    dstp = FLAG_GRAY ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     130                     : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    131131    dstdata = (float *)dstp->pixels;
    132132
     
    190190    h = src->h;
    191191
    192     srcp = FLAG_GRAY ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    193                      : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     192    srcp = FLAG_GRAY ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     193                     : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    194194    srcdata = (float *)srcp->pixels;
    195195
    196196    dst = pipi_new(w, h);
    197     dstp = FLAG_GRAY ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    198                      : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     197    dstp = FLAG_GRAY ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     198                     : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    199199    dstdata = (float *)dstp->pixels;
    200200
  • libpipi/trunk/pipi/filter/dilate.c

    r2902 r3340  
    4343    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    4444
    45     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    46                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     45    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     46                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    4747    srcdata = (float *)srcp->pixels;
    4848
    4949    dst = pipi_new(w, h);
    50     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    51                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     50    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     51                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    5252    dstdata = (float *)dstp->pixels;
    5353
     
    112112    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    113113
    114     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    115                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     114    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     115                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    116116    srcdata = (float *)srcp->pixels;
    117117
    118118    dst = pipi_new(w, h);
    119     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    120                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     119    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     120                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    121121    dstdata = (float *)dstp->pixels;
    122122
  • libpipi/trunk/pipi/filter/median.c

    r2902 r3340  
    5858    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    5959
    60     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    61                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     60    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     61                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    6262    srcdata = (float *)srcp->pixels;
    6363
    6464    dst = pipi_new(w, h);
    65     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    66                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     65    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     66                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    6767    dstdata = (float *)dstp->pixels;
    6868
  • libpipi/trunk/pipi/filter/transform.c

    r2902 r3340  
    3939    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    4040
    41     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    42                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     41    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     42                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    4343    srcdata = (float *)srcp->pixels;
    4444
    4545    dst = pipi_new(w, h);
    46     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    47                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     46    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     47                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    4848    dstdata = (float *)dstp->pixels;
    4949
     
    8585    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    8686
    87     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    88                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     87    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     88                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    8989    srcdata = (float *)srcp->pixels;
    9090
    9191    dst = pipi_new(w, h);
    92     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    93                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     92    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     93                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    9494    dstdata = (float *)dstp->pixels;
    9595
     
    125125    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    126126
    127     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    128                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     127    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     128                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    129129    srcdata = (float *)srcp->pixels;
    130130
    131131    dst = pipi_new(h, w);
    132     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    133                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     132    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     133                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    134134    dstdata = (float *)dstp->pixels;
    135135
     
    171171    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    172172
    173     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    174                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     173    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     174                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    175175    srcdata = (float *)srcp->pixels;
    176176
    177177    dst = pipi_new(w, h);
    178     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    179                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     178    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     179                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    180180    dstdata = (float *)dstp->pixels;
    181181
     
    217217    gray = (src->last_modified == PIPI_PIXELS_Y_F);
    218218
    219     srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
    220                 : pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     219    srcp = gray ? pipi_get_pixels(src, PIPI_PIXELS_Y_F)
     220                : pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    221221    srcdata = (float *)srcp->pixels;
    222222
    223223    dst = pipi_new(h, w);
    224     dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    225                 : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     224    dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     225                : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    226226    dstdata = (float *)dstp->pixels;
    227227
  • libpipi/trunk/pipi/paint/floodfill.c

    r2904 r3340  
    8383
    8484        /* Get ARGB32 pointer */
    85         dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_C);
     85        dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_C);
    8686        dstdata = (uint32_t *)dstp->pixels;
    8787
     
    100100        float or, og, ob, oa;
    101101
    102         dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
    103             : pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     102        dstp = gray ? pipi_get_pixels(dst, PIPI_PIXELS_Y_F)
     103            : pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    104104
    105105        dstdata = (float *)dstp->pixels;
  • libpipi/trunk/pipi/paint/line.c

    r3164 r3340  
    7373        {
    7474            uint32_t  *dstdata;
    75             dstdata = (uint32_t *)pipi_getpixels(img, PIPI_PIXELS_RGBA_C)->pixels;
     75            dstdata = (uint32_t *)pipi_get_pixels(img, PIPI_PIXELS_RGBA_C)->pixels;
    7676            s.color32 = c;
    7777            s.buf_u32 = dstdata;
     
    8181        {
    8282            float  *dstdata;
    83             dstdata = (float *)pipi_getpixels(img, PIPI_PIXELS_RGBA_F)->pixels;
     83            dstdata = (float *)pipi_get_pixels(img, PIPI_PIXELS_RGBA_F)->pixels;
    8484            s.colorf[2] = ((c&0x00FF0000)>>16)/255.0f; /* XXX FIXME */
    8585            s.colorf[1] = ((c&0x0000FF00)>>8)/255.0f;  /* XXX FIXME */
     
    9292    {
    9393        float  *dstdata;
    94         dstdata = (float *)pipi_getpixels(img, PIPI_PIXELS_Y_F)->pixels;
     94        dstdata = (float *)pipi_get_pixels(img, PIPI_PIXELS_Y_F)->pixels;
    9595        s.colorf[0] = (c & 0xff) / 255.0f; /* XXX FIXME */
    9696        s.buf_f = dstdata;
     
    100100    {
    101101        float  *dstdata;
    102         dstdata = (float *)pipi_getpixels(img, PIPI_PIXELS_RGBA_F)->pixels;
     102        dstdata = (float *)pipi_get_pixels(img, PIPI_PIXELS_RGBA_F)->pixels;
    103103        s.colorf[2] = ((c&0x00FF0000)>>16)/255.0f; /* XXX FIXME */
    104104        s.colorf[1] = ((c&0x0000FF00)>>8)/255.0f;  /* XXX FIXME */
  • libpipi/trunk/pipi/paint/tile.c

    r2902 r3340  
    3535
    3636    dst = pipi_new(w, h);
    37     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     37    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    3838    dstdata = (float *)dstp->pixels;
    3939
    40     tilep = pipi_getpixels(tile, PIPI_PIXELS_RGBA_F);
     40    tilep = pipi_get_pixels(tile, PIPI_PIXELS_RGBA_F);
    4141    tiledata = (float *)tilep->pixels;
    4242
  • libpipi/trunk/pipi/pipi.h

    r3339 r3340  
    144144
    145145__extern void pipi_set_gamma(double);
    146 __extern pipi_pixels_t *pipi_getpixels(pipi_image_t *, pipi_format_t);
     146__extern pipi_pixels_t *pipi_get_pixels(pipi_image_t *, pipi_format_t);
    147147__extern int pipi_get_image_width(pipi_image_t *img);
    148148__extern int pipi_get_image_height(pipi_image_t *img);
  • libpipi/trunk/pipi/pixels.c

    r2902 r3340  
    3737
    3838/* Return a direct pointer to an image's pixels. */
    39 pipi_pixels_t *pipi_getpixels(pipi_image_t *img, pipi_format_t type)
     39pipi_pixels_t *pipi_get_pixels(pipi_image_t *img, pipi_format_t type)
    4040{
    4141    size_t bytes = 0;
     
    5555    if(img->last_modified == PIPI_PIXELS_RGBA_C
    5656                  && type == PIPI_PIXELS_Y_F)
    57         pipi_getpixels(img, PIPI_PIXELS_RGBA_F);
     57        pipi_get_pixels(img, PIPI_PIXELS_RGBA_F);
    5858    else if(img->last_modified == PIPI_PIXELS_BGR_C
    5959                       && type == PIPI_PIXELS_Y_F)
    60         pipi_getpixels(img, PIPI_PIXELS_RGBA_F);
     60        pipi_get_pixels(img, PIPI_PIXELS_RGBA_F);
    6161    else if(img->last_modified == PIPI_PIXELS_Y_F
    6262                       && type == PIPI_PIXELS_RGBA_C)
    63         pipi_getpixels(img, PIPI_PIXELS_RGBA_F);
     63        pipi_get_pixels(img, PIPI_PIXELS_RGBA_F);
    6464    else if(img->last_modified == PIPI_PIXELS_Y_F
    6565                       && type == PIPI_PIXELS_BGR_C)
    66         pipi_getpixels(img, PIPI_PIXELS_RGBA_F);
     66        pipi_get_pixels(img, PIPI_PIXELS_RGBA_F);
    6767
    6868    /* Allocate pixels if necessary */
  • libpipi/trunk/pipi/quantize/reduce.c

    r3161 r3340  
    379379    debug("");
    380380
    381     srcp = pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     381    srcp = pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    382382    srcdata = (float *)srcp->pixels;
    383383
     
    386386
    387387    dst = pipi_new(w, h);
    388     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     388    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    389389    dstdata = (float *)dstp->pixels;
    390390
  • libpipi/trunk/pipi/render/noise.c

    r2902 r3340  
    3535
    3636    ret = pipi_new(w, h);
    37     pix = pipi_getpixels(ret, PIPI_PIXELS_RGBA_F);
     37    pix = pipi_get_pixels(ret, PIPI_PIXELS_RGBA_F);
    3838    data = (float *)pix->pixels;
    3939
  • libpipi/trunk/pipi/render/screen.c

    r2905 r3340  
    4545
    4646    ret = pipi_new(w, h);
    47     pix = pipi_getpixels(ret, PIPI_PIXELS_Y_F);
     47    pix = pipi_get_pixels(ret, PIPI_PIXELS_Y_F);
    4848    data = (float *)pix->pixels;
    4949
     
    108108
    109109    ret = pipi_new(w * 2, h * 2);
    110     pix = pipi_getpixels(ret, PIPI_PIXELS_Y_F);
     110    pix = pipi_get_pixels(ret, PIPI_PIXELS_Y_F);
    111111    data = (float *)pix->pixels;
    112112
  • libpipi/trunk/pipi/resize.c

    r2902 r3340  
    3232    int x, y, x0, y0, sw, dw, sh, dh, remy;
    3333
    34     srcp = pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
     34    srcp = pipi_get_pixels(src, PIPI_PIXELS_RGBA_F);
    3535    srcdata = (float *)srcp->pixels;
    3636
    3737    dst = pipi_new(w, h);
    38     dstp = pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
     38    dstp = pipi_get_pixels(dst, PIPI_PIXELS_RGBA_F);
    3939    dstdata = (float *)dstp->pixels;
    4040
  • libpipi/trunk/pipi/stock.c

    r2902 r3340  
    174174
    175175        ret = pipi_new(w, h);
    176         pix = pipi_getpixels(ret, PIPI_PIXELS_Y_F);
     176        pix = pipi_get_pixels(ret, PIPI_PIXELS_Y_F);
    177177        memcpy(pix->pixels, ker, w * h * sizeof(float));
    178178
  • libpipi/trunk/test/u8tof32tou8.c

    r2902 r3340  
    3535    img2 = pipi_load("mona.png");
    3636
    37     pix1 = pipi_getpixels(img1, PIPI_PIXELS_RGBA_C);
     37    pix1 = pipi_get_pixels(img1, PIPI_PIXELS_RGBA_C);
    3838    data1 = (uint32_t *)pix1->pixels;
    3939
    40     pipi_getpixels(img2, PIPI_PIXELS_RGBA_F);
    41     pix2 = pipi_getpixels(img2, PIPI_PIXELS_RGBA_C);
     40    pipi_get_pixels(img2, PIPI_PIXELS_RGBA_F);
     41    pix2 = pipi_get_pixels(img2, PIPI_PIXELS_RGBA_C);
    4242    data2 = (uint32_t *)pix2->pixels;
    4343
Note: See TracChangeset for help on using the changeset viewer.