annotate dmimage.c @ 757:dd59a650a318

Fix 24-bit surface conversions in image loader.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 08 May 2013 02:02:01 +0300
parents 32250b436bca
children
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
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
10 #define STBI_FAILURE_USERMSG 1
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
11 #define STBI_NO_STDIO 1
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
12 #define STBI_NO_HDR 1
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
13 #include "stb_image.c"
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
14
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 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
17 {
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
18 // Create source surface from given data
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
19 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
20
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
21 // Result surface component orders as masks
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
22 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
23 Uint32
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
24 Xrmask = 0xff000000,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
25 Xgmask = 0x00ff0000,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
26 Xbmask = 0x0000ff00,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
27 Xamask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
28 #else
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
29 Uint32
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
30 Xrmask = 0x000000ff,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
31 Xgmask = 0x0000ff00,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
32 Xbmask = 0x00ff0000,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
33 Xamask = 0xff000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
34 #endif
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
35
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
36 // Create result conversion surface
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
37 SDL_Surface
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
38 *result = NULL,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
39 *pixtmp = SDL_CreateRGBSurface(
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
40 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
41
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
42 if (tmp != NULL && pixtmp != NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
43 {
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
44 // Convert surface
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
45 result = SDL_ConvertSurface(tmp, pixtmp->format, SDL_SWSURFACE | SDL_SRCALPHA);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
46 SDL_FreeSurface(tmp);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
47 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
48 if (pixtmp != NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
49 SDL_FreeSurface(pixtmp);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
50
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
51 return result;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
52 }
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 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
56 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
57 int yc;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
58 Uint8 *dst, *src;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
59 SDL_Surface *result;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
60 result = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 8, 0,0,0,0);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
61 if (result == NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
62 return NULL;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
63
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
64 dst = result->pixels;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
65 src = data;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
66 for (yc = 0; yc < height; yc++)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
67 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
68 memcpy(dst, src, width * sizeof(Uint8));
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
69 dst += result->pitch;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
70 src += pitch;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
71 }
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 return result;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
74 }
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 static int dmSTBIread(void *user, char *data, int size)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
79 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
80 return dmfread(data, 1, size, (DMResource *) user);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
81 }
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 static void dmSTBIskip(void *user, unsigned int n)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
85 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
86 dmfseek((DMResource *) user, n, SEEK_CUR);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
87 }
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 static int dmSTBIeof(void *user)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
91 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
92 return dmfeof((DMResource *) user);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
93 }
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 static const stbi_io_callbacks dmSTBICallbacks =
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
97 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
98 dmSTBIread,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
99 dmSTBIskip,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
100 dmSTBIeof,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
101 };
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 SDL_Surface *dmLoadImage(DMResource *file)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
105 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
106 Uint32 rmask, gmask, bmask, amask;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
107 SDL_Surface *result = NULL;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
108 int width, height, comp;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
109 Uint8 *data;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
110
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
111 data = stbi_load_from_callbacks(&dmSTBICallbacks, file, &width, &height, &comp, 0);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
112
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
113 if (data == NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
114 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
115 dmError("Error decoding image resource %p '%s' [%d, %d, %d]: %s\n",
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
116 file, file->filename, width, height, comp, stbi_failure_reason());
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
117 return NULL;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
118 }
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 switch (comp)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
122 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
123 case 4:
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
124 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
125 rmask = 0xff000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
126 gmask = 0x00ff0000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
127 bmask = 0x0000ff00;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
128 amask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
129 #else
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
130 rmask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
131 gmask = 0x0000ff00;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
132 bmask = 0x00ff0000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
133 amask = 0xff000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
134 #endif
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
135 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
136 width * comp, rmask, gmask, bmask, amask);
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
137 break;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
138
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
139 case 3:
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
140 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
141 rmask = 0x00ff0000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
142 gmask = 0x0000ff00;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
143 bmask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
144 amask = 0x00000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
145 #else
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
146 rmask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
147 gmask = 0x0000ff00;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
148 bmask = 0x00ff0000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
149 amask = 0x00000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
150 #endif
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
151 result = dmCreateRGBSurfaceFrom(data, width, height, comp * 8,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
152 width * comp, rmask, gmask, bmask, amask);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
153 break;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
154
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
155 case 1:
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
156 result = dmCreatePaletteSurfaceFrom(data, width, height, width * comp);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
157 break;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
158 }
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 stbi_image_free(data);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
161
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
162 if (result == NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
163 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
164 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
165 file, file->filename, width, height, comp);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
166 }
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 return result;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
169 }