Ver código fonte

* Implement pipi_vflip() and pipi_hflip().

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2749 92316355-f0b4-4df1-b90c-862c8a59935f
remotes/tiles
sam 16 anos atrás
pai
commit
2da45f954b
5 arquivos alterados com 146 adições e 0 exclusões
  1. +1
    -0
      pipi/Makefile.am
  2. +18
    -0
      pipi/context.c
  3. +115
    -0
      pipi/filter/transform.c
  4. +2
    -0
      pipi/pipi.h
  5. +10
    -0
      src/pipi.c

+ 1
- 0
pipi/Makefile.am Ver arquivo

@@ -55,6 +55,7 @@ filter_sources = \
filter/blur.c \
filter/convolution.c filter/convolution_template.h \
filter/color.c \
filter/transform.c \
filter/median.c \
filter/dilate.c



+ 18
- 0
pipi/context.c Ver arquivo

@@ -324,6 +324,24 @@ int pipi_command(pipi_context_t *ctx, char const *cmd, ...)
pipi_free(src);
ctx->images[ctx->nimages - 1] = dst;
}
else if(!strcmp(cmd, "hflip"))
{
pipi_image_t *tmp;
if(ctx->nimages < 1)
return -1;
tmp = ctx->images[ctx->nimages - 1];
ctx->images[ctx->nimages - 1] = pipi_hflip(tmp);
pipi_free(tmp);
}
else if(!strcmp(cmd, "vflip"))
{
pipi_image_t *tmp;
if(ctx->nimages < 1)
return -1;
tmp = ctx->images[ctx->nimages - 1];
ctx->images[ctx->nimages - 1] = pipi_vflip(tmp);
pipi_free(tmp);
}
else if(!strcmp(cmd, "mean"))
{
pipi_image_t *dst;


+ 115
- 0
pipi/filter/transform.c Ver arquivo

@@ -0,0 +1,115 @@
/*
* libpipi Proper image processing implementation library
* Copyright (c) 2004-2008 Sam Hocevar <sam@zoy.org>
* All Rights Reserved
*
* $Id$
*
* This library is free software. It comes without any warranty, to
* the extent permitted by applicable law. You can redistribute it
* and/or modify it under the terms of the Do What The Fuck You Want
* To Public License, Version 2, as published by Sam Hocevar. See
* http://sam.zoy.org/wtfpl/COPYING for more details.
*/

/*
* transform.c: basic transformation functions
*/

#include "config.h"
#include "common.h"

#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <math.h>

#include "pipi.h"
#include "pipi_internals.h"

pipi_image_t *pipi_hflip(pipi_image_t *src)
{
pipi_image_t *dst;
pipi_pixels_t *srcp, *dstp;
float *srcdata, *dstdata;
int x, y, w, h, gray;

w = src->w;
h = src->h;

gray = (src->last_modified == PIPI_PIXELS_Y_F);

srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
: pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
srcdata = (float *)srcp->pixels;

dst = pipi_new(w, h);
dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
: pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
dstdata = (float *)dstp->pixels;

for(y = 0; y < h; y++)
{
for(x = 0; x < w; x++)
{
if(gray)
{
dstdata[y * w + x] = srcdata[y * w + w - 1 - x];
}
else
{
dstdata[4 * (y * w + x)]
= srcdata[4 * (y * w + w - 1 - x)];
dstdata[4 * (y * w + x) + 1]
= srcdata[4 * (y * w + w - 1 - x) + 1];
dstdata[4 * (y * w + x) + 2]
= srcdata[4 * (y * w + w - 1 - x) + 2];
dstdata[4 * (y * w + x) + 3]
= srcdata[4 * (y * w + w - 1 - x) + 3];
}
}
}

return dst;
}

pipi_image_t *pipi_vflip(pipi_image_t *src)
{
pipi_image_t *dst;
pipi_pixels_t *srcp, *dstp;
float *srcdata, *dstdata;
int x, y, w, h, gray;

w = src->w;
h = src->h;

gray = (src->last_modified == PIPI_PIXELS_Y_F);

srcp = gray ? pipi_getpixels(src, PIPI_PIXELS_Y_F)
: pipi_getpixels(src, PIPI_PIXELS_RGBA_F);
srcdata = (float *)srcp->pixels;

dst = pipi_new(w, h);
dstp = gray ? pipi_getpixels(dst, PIPI_PIXELS_Y_F)
: pipi_getpixels(dst, PIPI_PIXELS_RGBA_F);
dstdata = (float *)dstp->pixels;

for(y = 0; y < h; y++)
{
if(gray)
{
memcpy(dstdata + y * w,
srcdata + (h - 1 - y) * w,
w * sizeof(*dstdata));
}
else
{
memcpy(dstdata + 4 * y * w,
srcdata + 4 * (h - 1 - y) * w,
4 * w * sizeof(*dstdata));
}
}

return dst;
}


+ 2
- 0
pipi/pipi.h Ver arquivo

@@ -127,6 +127,8 @@ extern pipi_image_t *pipi_contrast(pipi_image_t *, double);
extern pipi_image_t *pipi_autocontrast(pipi_image_t *);
extern pipi_image_t *pipi_invert(pipi_image_t *);
extern pipi_image_t *pipi_threshold(pipi_image_t *, double);
extern pipi_image_t *pipi_hflip(pipi_image_t *);
extern pipi_image_t *pipi_vflip(pipi_image_t *);
extern pipi_image_t *pipi_median(pipi_image_t *, int);
extern pipi_image_t *pipi_median_ext(pipi_image_t *, int, int);
extern pipi_image_t *pipi_dilate(pipi_image_t *);


+ 10
- 0
src/pipi.c Ver arquivo

@@ -107,6 +107,16 @@ int main(int argc, char *argv[])
if(pipi_command(ctx, "autocontrast") != 0)
return EXIT_FAILURE;
}
else if(!strcmp(argv[0], "--hflip"))
{
if(pipi_command(ctx, "hflip") != 0)
return EXIT_FAILURE;
}
else if(!strcmp(argv[0], "--vflip"))
{
if(pipi_command(ctx, "vflip") != 0)
return EXIT_FAILURE;
}
else if(!strcmp(argv[0], "--invert"))
{
if(pipi_command(ctx, "invert") != 0)


Carregando…
Cancelar
Salvar