image->bytes_per_row = width * bytes_per_pixel;
image->rgb.used = 0;
- for (i=0; i<MAX_COLORS; i++)
+ for (i = 0; i < MAX_COLORS; i++)
image->rgb.color_used[i] = FALSE;
image->type = (depth < 8 ? IMAGETYPE_BITMAP :
* the corresponding image pixmap
*/
- for (y=0; y<image->height; y++)
+ for (y = 0; y < image->height; y++)
{
bitmask = 0x01; /* start with leftmost bit in the byte */
dst_ptr2 = dst_ptr; /* start with leftmost byte in the row */
- for (x=0; x<image->width; x++)
+ for (x = 0; x < image->width; x++)
{
- for (i=0; i<image->bytes_per_pixel; i++)
+ for (i = 0; i < image->bytes_per_pixel; i++)
if (*src_ptr++) /* source pixel solid? (pixel index != 0) */
*dst_ptr2 |= bitmask; /* then write a bit into the image mask */
pixmap_format = XListPixmapFormats(display, &num_pixmap_formats);
/* find format that matches the given depth */
- for (i=0; i<num_pixmap_formats; i++)
+ for (i = 0; i < num_pixmap_formats; i++)
if (pixmap_format[i].depth == depth)
bits_per_pixel = pixmap_format[i].bits_per_pixel;
/* calculate number of distinct colors in each band */
redcolors = greencolors = bluecolors = 1;
- for (pixval=1; pixval; pixval <<= 1)
+ for (pixval = 1; pixval; pixval <<= 1)
{
if (pixval & visual->red_mask)
redcolors <<= 1;
redbottom = greenbottom = bluebottom = 0;
redtop = greentop = bluetop = 0;
- for (a=0; a<visual->map_entries; a++)
+ for (a = 0; a < visual->map_entries; a++)
{
if (redbottom < 256)
redtop = redbottom + redstep;
ximageinfo->cmap = global_cmap;
- for (a=0; a<MAX_COLORS; a++)
+ for (a = 0; a < MAX_COLORS; a++)
{
XColor xcolor2;
unsigned short mask;
/* allocate the rest of the color cells read/write */
global_cmap_index =
(Pixel *)checked_malloc(sizeof(Pixel) * NOFLASH_COLORS);
- for (i=0; i<NOFLASH_COLORS; i++)
+ for (i = 0; i < NOFLASH_COLORS; i++)
if (!XAllocColorCells(display, global_cmap, FALSE, NULL, 0,
global_cmap_index + i, 1))
break;
/* to minimize colormap flashing, copy default colors and try
to keep them as near as possible to the old values */
- for(i=0; i<num_cmap_entries; i++)
+ for (i = 0; i < num_cmap_entries; i++)
{
xcolor2.pixel = *(global_cmap_index + i);
XQueryColor(display, DefaultColormap(display, screen), &xcolor2);
while (!color_found)
{
- for (i=num_cmap_entries-1; i>=0; i--)
+ for (i = num_cmap_entries - 1; i >= 0; i--)
{
xcolor2.pixel = *(global_cmap_index + i);
xcolor2 = xcolor_private[xcolor2.pixel];
{
case IMAGETYPE_RGB:
{
- for (y=0; y<image->height; y++) /* general case */
+ for (y = 0; y < image->height; y++) /* general case */
{
- for (x=0; x<image->width; x++)
+ for (x = 0; x < image->width; x++)
{
pixval = *src_ptr++;
pixval =
case IMAGETYPE_TRUECOLOR:
{
- for (y=0; y<image->height; y++) /* general case */
+ for (y = 0; y < image->height; y++) /* general case */
{
- for (x=0; x<image->width; x++)
+ for (x = 0; x < image->width; x++)
{
pixval = memory_to_value(src_ptr, image->bytes_per_pixel);
pixval =
{
if (display_bytes_per_pixel == 1) /* special case */
{
- for (y=0; y<image->height; y++)
- for (x=0; x<image->width; x++)
+ for (y = 0; y < image->height; y++)
+ for (x = 0; x < image->width; x++)
*dst_ptr++ = ximageinfo->index[c + *src_ptr++];
}
else /* general case */
{
- for (y=0; y<image->height; y++)
+ for (y = 0; y < image->height; y++)
{
- for (x=0; x<image->width; x++)
+ for (x = 0; x < image->width; x++)
{
value_to_memory(ximageinfo->index[c + *src_ptr++],
dst_ptr, display_bytes_per_pixel);
XPutImage(ximageinfo->display, ximageinfo->pixmap, gc,
ximage, 0, 0, 0, 0, ximage->width, ximage->height);
- XDestroyImage(ximage);
+ X11DestroyImage(ximage);
return ximageinfo;
}
int zoom_factor = src_width / dst_width; /* currently very limited! */
int row_skip, col_skip;
+ /* adjust source image size to integer multiple of destination image size */
+ src_width = dst_width * zoom_factor;
+ src_height = dst_height * zoom_factor;
+
/* copy source pixmap to temporary image */
- src_ximage = XGetImage(display, src_pixmap, 0, 0,
- src_width, src_height, AllPlanes, ZPixmap);
+ src_ximage = XGetImage(display, src_pixmap, 0, 0, src_width, src_height,
+ AllPlanes, ZPixmap);
bits_per_pixel = src_ximage->bits_per_pixel;
bytes_per_pixel = (bits_per_pixel + 7) / 8;
row_skip = col_skip * src_width;
/* scale image down by scaling factor 'zoom_factor' */
- for (y=0; y < src_height; y += zoom_factor, src_ptr += row_skip)
- for (x=0; x < src_width; x += zoom_factor, src_ptr += col_skip)
- for (i=0; i<bytes_per_pixel; i++)
+ for (y = 0; y < src_height; y += zoom_factor, src_ptr += row_skip)
+ for (x = 0; x < src_width; x += zoom_factor, src_ptr += col_skip)
+ for (i = 0; i < bytes_per_pixel; i++)
*dst_ptr++ = *src_ptr++;
/* copy scaled image to destination pixmap */
XPutImage(display, dst_pixmap, gc, dst_ximage, 0, 0, 0, 0,
- MIN(src_width, dst_width), MIN(src_height, dst_height));
+ dst_width, dst_height);
/* free temporary images */
- XDestroyImage(src_ximage);
- XDestroyImage(dst_ximage);
+ X11DestroyImage(src_ximage);
+ X11DestroyImage(dst_ximage);
}
void freeXImage(Image *image, XImageInfo *ximageinfo)
{
ImageInfo *img_info;
-#if 1
+#if 0
printf("loading PCX file '%s'\n", filename);
#endif
if ((img_info->bitmap = LoadImage(filename)) == NULL)
{
- Error(ERR_WARN, "cannot read image file '%s': LoadImage() failed: %s",
+ Error(ERR_WARN, "cannot load image file '%s': LoadImage() failed: %s",
filename, GetError());
free(img_info);
return NULL;
char *getTokenFromImageID(int graphic)
{
+#if 0
+ /* !!! this does not work for dynamic artwork (crash!) !!! */
struct FileInfo *file_list = (struct FileInfo *)image_info->file_list;
return file_list[graphic].token;
+#else
+ struct FileInfo *file_list = getImageListEntry(graphic);
+
+ return (file_list != NULL ? file_list->token : NULL);
+#endif
+}
+
+int getImageIDFromToken(char *token)
+{
+ struct FileInfo *file_list = image_info->file_list;
+ int num_list_entries = image_info->num_file_list_entries;
+ int i;
+
+ for (i = 0; i < num_list_entries; i++)
+ if (strcmp(file_list[i].token, token) == 0)
+ return i;
+
+ return -1;
}
char *getImageConfigFilename()
image_info->dynamic_file_list = NULL;
image_info->num_suffix_list_entries = 0;
- for (i=0; config_suffix_list[i].token != NULL; i++)
+ for (i = 0; config_suffix_list[i].token != NULL; i++)
image_info->num_suffix_list_entries++;
image_info->suffix_list = config_suffix_list;
/* ---------- initialize base prefix and suffixes lists ---------- */
image_info->num_base_prefixes = 0;
- for (i=0; base_prefixes[i] != NULL; i++)
+ for (i = 0; base_prefixes[i] != NULL; i++)
image_info->num_base_prefixes++;
image_info->num_ext1_suffixes = 0;
- for (i=0; ext1_suffixes[i] != NULL; i++)
+ for (i = 0; ext1_suffixes[i] != NULL; i++)
image_info->num_ext1_suffixes++;
image_info->num_ext2_suffixes = 0;
- for (i=0; ext2_suffixes[i] != NULL; i++)
+ for (i = 0; ext2_suffixes[i] != NULL; i++)
image_info->num_ext2_suffixes++;
image_info->num_ext3_suffixes = 0;
- for (i=0; ext3_suffixes[i] != NULL; i++)
+ for (i = 0; ext3_suffixes[i] != NULL; i++)
image_info->num_ext3_suffixes++;
image_info->num_ignore_tokens = 0;
- for (i=0; ignore_tokens[i] != NULL; i++)
+ for (i = 0; ignore_tokens[i] != NULL; i++)
image_info->num_ignore_tokens++;
image_info->base_prefixes = base_prefixes;
projects / rocksndiamonds.git / blobdiff