annotate src/dmimage.c @ 870:2711f99b40e5

Modify stb_image so that we can eventually lift out the zlib functionality.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 03 Feb 2015 20:07:38 +0200
parents 1e5cf1144f36
children 63fd1801f983
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
1 /*
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
2 * DMLib
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
3 * -- Bitmap image conversion and loading
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
4 * Programmed and designed by Matti 'ccr' Hamalainen
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
5 * (C) Copyright 2012 Tecnic Software productions (TNSP)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
6 */
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
7 #include "dmimage.h"
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
8
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
9
870
2711f99b40e5 Modify stb_image so that we can eventually lift out the zlib functionality.
Matti Hamalainen <ccr@tnsp.org>
parents: 812
diff changeset
10 #define STBI_INTERNAL_ZLIB 1
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
11 #define STBI_FAILURE_USERMSG 1
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
12 #define STBI_NO_STDIO 1
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
13 #define STBI_NO_HDR 1
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
14 #include "stb_image.c"
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
15
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
16
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
17 SDL_Surface *dmCreateRGBSurfaceFrom(void *data, const int width, const int height, const int depth, const int pitch, const int rmask, const int gmask, const int bmask, const int amask)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
18 {
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
19 // Create source surface from given data
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
20 SDL_Surface *tmp = SDL_CreateRGBSurfaceFrom(data, width, height, depth, pitch, bmask, gmask, rmask, amask);
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
21
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
22 // Result surface component orders as masks
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
23 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
24 Uint32
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
25 Xrmask = 0xff000000,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
26 Xgmask = 0x00ff0000,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
27 Xbmask = 0x0000ff00,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
28 Xamask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
29 #else
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
30 Uint32
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
31 Xrmask = 0x000000ff,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
32 Xgmask = 0x0000ff00,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
33 Xbmask = 0x00ff0000,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
34 Xamask = 0xff000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
35 #endif
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
36
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
37 // Create result conversion surface
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
38 SDL_Surface
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
39 *result = NULL,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
40 *pixtmp = SDL_CreateRGBSurface(
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
41 SDL_SWSURFACE | SDL_SRCALPHA, 16, 16, 32, Xrmask, Xgmask, Xbmask, Xamask);
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
42
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
43 if (tmp != NULL && pixtmp != NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
44 {
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
45 // Convert surface
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
46 result = SDL_ConvertSurface(tmp, pixtmp->format, SDL_SWSURFACE | SDL_SRCALPHA);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
47 SDL_FreeSurface(tmp);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
48 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
49 if (pixtmp != NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
50 SDL_FreeSurface(pixtmp);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
51
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
52 return result;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
53 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
54
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
55
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
56 SDL_Surface *dmCreatePaletteSurfaceFrom(void *data, const int width, const int height, const int pitch)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
57 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
58 int yc;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
59 Uint8 *dst, *src;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
60 SDL_Surface *result;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
61 result = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 8, 0,0,0,0);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
62 if (result == NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
63 return NULL;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
64
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
65 dst = result->pixels;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
66 src = data;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
67 for (yc = 0; yc < height; yc++)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
68 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
69 memcpy(dst, src, width * sizeof(Uint8));
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
70 dst += result->pitch;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
71 src += pitch;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
72 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
73
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
74 return result;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
75 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
76
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
77
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
78
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
79 static int dmSTBIread(void *user, char *data, int size)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
80 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
81 return dmfread(data, 1, size, (DMResource *) user);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
82 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
83
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
84
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
85 static void dmSTBIskip(void *user, unsigned int n)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
86 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
87 dmfseek((DMResource *) user, n, SEEK_CUR);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
88 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
89
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
90
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
91 static int dmSTBIeof(void *user)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
92 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
93 return dmfeof((DMResource *) user);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
94 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
95
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
96
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
97 static const stbi_io_callbacks dmSTBICallbacks =
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
98 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
99 dmSTBIread,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
100 dmSTBIskip,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
101 dmSTBIeof,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
102 };
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
103
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
104
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
105 SDL_Surface *dmLoadImage(DMResource *file)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
106 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
107 Uint32 rmask, gmask, bmask, amask;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
108 SDL_Surface *result = NULL;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
109 int width, height, comp;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
110 Uint8 *data;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
111
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
112 data = stbi_load_from_callbacks(&dmSTBICallbacks, file, &width, &height, &comp, 0);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
113
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
114 if (data == NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
115 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
116 dmError("Error decoding image resource %p '%s' [%d, %d, %d]: %s\n",
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
117 file, file->filename, width, height, comp, stbi_failure_reason());
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
118 return NULL;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
119 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
120
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
121
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
122 switch (comp)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
123 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
124 case 4:
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
125 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
126 rmask = 0xff000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
127 gmask = 0x00ff0000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
128 bmask = 0x0000ff00;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
129 amask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
130 #else
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
131 rmask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
132 gmask = 0x0000ff00;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
133 bmask = 0x00ff0000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
134 amask = 0xff000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
135 #endif
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
136 result = dmCreateRGBSurfaceFrom(data, width, height, comp * 8,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
137 width * comp, rmask, gmask, bmask, amask);
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
138 break;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
139
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
140 case 3:
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
141 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
142 rmask = 0x00ff0000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
143 gmask = 0x0000ff00;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
144 bmask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
145 amask = 0x00000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
146 #else
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
147 rmask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
148 gmask = 0x0000ff00;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
149 bmask = 0x00ff0000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
150 amask = 0x00000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
151 #endif
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
152 result = dmCreateRGBSurfaceFrom(data, width, height, comp * 8,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
153 width * comp, rmask, gmask, bmask, amask);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
154 break;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
155
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
156 case 1:
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
157 result = dmCreatePaletteSurfaceFrom(data, width, height, width * comp);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
158 break;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
159 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
160
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
161 stbi_image_free(data);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
162
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
163 if (result == NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
164 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
165 dmError("Format conversion failed for image resource %p '%s' [%d, %d, %d].\n",
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
166 file, file->filename, width, height, comp);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
167 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
168
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
169 return result;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
170 }