comparison src/image.c @ 109866:73512e4aa257

image-mode changes. removed the imagemagick specific :geometry and :crop interface that wasnt very good.

109865:131c45ff9c34

    IMAGEMAGICK_RELIEF,
    IMAGEMAGICK_ALGORITHM,
    IMAGEMAGICK_HEURISTIC_MASK,
    IMAGEMAGICK_MASK,
    IMAGEMAGICK_BACKGROUND,
    IMAGEMAGICK_LAST
  };

/* Vector of image_keyword structures describing the format
   of valid user-defined image specifications.  */

    {":margin",		IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,	0},
    {":relief",		IMAGE_INTEGER_VALUE,			0},
    {":conversion",	IMAGE_DONT_CHECK_VALUE_TYPE,		0},
    {":heuristic-mask",	IMAGE_DONT_CHECK_VALUE_TYPE,		0},
    {":mask",		IMAGE_DONT_CHECK_VALUE_TYPE,		0},
    {":background",	IMAGE_STRING_OR_NIL_VALUE,		0}
  };
/* Free X resources of imagemagick image IMG which is used on frame F.  */

static void
imagemagick_clear_image (struct frame *f,

    MagickSetFirstIterator(image_wand);
  else
    MagickSetIteratorIndex(image_wand, ino);

  /* If width and/or height is set in the display spec assume we want
    to scale to those.  */

  value = image_spec_value (img->spec, QCwidth, NULL);
  desired_width = (INTEGERP (value)  ? XFASTINT (value) : -1);
  value = image_spec_value (img->spec, QCheight, NULL);
  desired_height = (INTEGERP (value) ? XFASTINT (value) : -1);
  /* TODO if h or w is left out, it should be calculated to preserve aspect ratio */
  /* get original w and h, these will be recalculated before final blit*/
  height = MagickGetImageHeight (image_wand);
  width = MagickGetImageWidth (image_wand);

  if(desired_width != -1 && desired_height == -1)
    {

      x=XFASTINT(XCAR(XCDR(XCDR(crop))));
      y=XFASTINT(XCAR(XCDR(XCDR(XCDR(crop)))));
      printf("MagickCropImage(image_wand, %d,%d, %d,%d)\n", w, h, x, y);
      MagickCropImage(image_wand, w,h, x,y);
    }
  
  if (STRINGP (crop) && STRINGP (geometry))
    {
      printf("MagickTransformImage %s %s\n", SDATA(crop), SDATA(geometry));
      image_wand = MagickTransformImage (image_wand, SDATA (crop),
                                         SDATA (geometry));
      /* TODO differ between image_wand and transform_wand. */
    }

  
  /* Furthermore :rotation. we need background color and angle for
     rotation.  */
  /*
    TODO background handling for rotation specified_bg =

          image_error ("Imagemagick image rotate failed", Qnil, Qnil);
          goto imagemagick_error;
        }
    }
  
  /* Finaly we are done manipulating the image,
     figure out resulting width, height, and then transfer ownerwship to Emacs.
  */
  height = MagickGetImageHeight (image_wand);
  width = MagickGetImageWidth (image_wand);
  if (status == MagickFalse)
    {

          goto imagemagick_error;
        }
    
      /* Copy imagegmagick image to x with primitive yet robust pixel
         pusher loop.  This has been tested a lot with many different
         images, it doesnt work too well with image archive formats though!

         Also seems slow.
      */
  
      /* Copy pixels from the imagemagick image structure to the x image map. */
      iterator = NewPixelIterator (image_wand);
      if ((iterator == (PixelIterator *) NULL))

    }

  if (imagemagick_rendermethod == 1)
    {
      /* Try if magicexportimage is any faster than pixelpushing. */
      /* printf("ximg: bitmap_unit:%d format:%d byte_order:%d depth:%d
         bits_per_pixel:%d\n", */
      /*        ximg->bitmap_unit,ximg->format,ximg->byte_order,
                ximg->depth,ximg->bits_per_pixel); */
      int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/
      char* exportdepth = imagedepth <= 8 ? "I" : "BGRP";/*"RGBP";*/
      /* Try to create a x pixmap to hold the imagemagick pixmap.  */
      printf("imagedepth:%d exportdepth:%s\n", imagedepth, exportdepth);
      if (!x_create_x_image_and_pixmap (f, width, height, imagedepth,

109866:73512e4aa257

    IMAGEMAGICK_RELIEF,
    IMAGEMAGICK_ALGORITHM,
    IMAGEMAGICK_HEURISTIC_MASK,
    IMAGEMAGICK_MASK,
    IMAGEMAGICK_BACKGROUND,
    IMAGEMAGICK_HEIGHT,
    IMAGEMAGICK_WIDTH,
    IMAGEMAGICK_ROTATION,
    IMAGEMAGICK_CROP,
    IMAGEMAGICK_LAST
  };

/* Vector of image_keyword structures describing the format
   of valid user-defined image specifications.  */

    {":margin",		IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,	0},
    {":relief",		IMAGE_INTEGER_VALUE,			0},
    {":conversion",	IMAGE_DONT_CHECK_VALUE_TYPE,		0},
    {":heuristic-mask",	IMAGE_DONT_CHECK_VALUE_TYPE,		0},
    {":mask",		IMAGE_DONT_CHECK_VALUE_TYPE,		0},
    {":background",	IMAGE_STRING_OR_NIL_VALUE,		0},
    {":height",		IMAGE_INTEGER_VALUE,			0},    
    {":width",		IMAGE_INTEGER_VALUE,			0},    
    {":rotation",	IMAGE_NUMBER_VALUE,     		0},    
    {":crop",		IMAGE_DONT_CHECK_VALUE_TYPE,		0}
  };
/* Free X resources of imagemagick image IMG which is used on frame F.  */

static void
imagemagick_clear_image (struct frame *f,

    MagickSetFirstIterator(image_wand);
  else
    MagickSetIteratorIndex(image_wand, ino);

  /* If width and/or height is set in the display spec assume we want
    to scale to those values.  if either h or w is unspecified, the
    unspecified should be calculated from the specified to preserve
    aspect ratio. */

  value = image_spec_value (img->spec, QCwidth, NULL);
  desired_width = (INTEGERP (value)  ? XFASTINT (value) : -1);
  value = image_spec_value (img->spec, QCheight, NULL);
  desired_height = (INTEGERP (value) ? XFASTINT (value) : -1);

  height = MagickGetImageHeight (image_wand);
  width = MagickGetImageWidth (image_wand);

  if(desired_width != -1 && desired_height == -1)
    {

      x=XFASTINT(XCAR(XCDR(XCDR(crop))));
      y=XFASTINT(XCAR(XCDR(XCDR(XCDR(crop)))));
      printf("MagickCropImage(image_wand, %d,%d, %d,%d)\n", w, h, x, y);
      MagickCropImage(image_wand, w,h, x,y);
    }
  
  /* Furthermore :rotation. we need background color and angle for
     rotation.  */
  /*
    TODO background handling for rotation specified_bg =

          image_error ("Imagemagick image rotate failed", Qnil, Qnil);
          goto imagemagick_error;
        }
    }
  
  /* Finaly we are done manipulating the image, figure out resulting
     width, height, and then transfer ownerwship to Emacs.
  */
  height = MagickGetImageHeight (image_wand);
  width = MagickGetImageWidth (image_wand);
  if (status == MagickFalse)
    {

          goto imagemagick_error;
        }
    
      /* Copy imagegmagick image to x with primitive yet robust pixel
         pusher loop.  This has been tested a lot with many different
         images.
      */
  
      /* Copy pixels from the imagemagick image structure to the x image map. */
      iterator = NewPixelIterator (image_wand);
      if ((iterator == (PixelIterator *) NULL))

    }

  if (imagemagick_rendermethod == 1)
    {
      /* Try if magicexportimage is any faster than pixelpushing. */
      int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/
      char* exportdepth = imagedepth <= 8 ? "I" : "BGRP";/*"RGBP";*/
      /* Try to create a x pixmap to hold the imagemagick pixmap.  */
      printf("imagedepth:%d exportdepth:%s\n", imagedepth, exportdepth);
      if (!x_create_x_image_and_pixmap (f, width, height, imagedepth,