Mercurial > hg > dmlib

annotate src/dmimage.c @ 1165:737ae4718c8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use dmMemset, dmMalloc, dmRealloc and dmFree directly. Use Uint8 instead of unsigned char.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Mar 2015 07:27:54 +0200
parents d46966ad3b08
children 2b48b7fe95bc
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
950
88d9440afad0 Use dmzlib module in stb_image.
Matti Hamalainen <ccr@tnsp.org>
parents: 900
diff changeset
5 * (C) Copyright 2012-2015 Tecnic Software productions (TNSP)
0
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"
950
88d9440afad0 Use dmzlib module in stb_image.
Matti Hamalainen <ccr@tnsp.org>
parents: 900
diff changeset
8 #include "dmzlib.h"
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
9
1135
73808dce89e6 Disable formats other than PNG and JPEG from stb_image.
Matti Hamalainen <ccr@tnsp.org>
parents: 1102
diff changeset
10 // Formats
73808dce89e6 Disable formats other than PNG and JPEG from stb_image.
Matti Hamalainen <ccr@tnsp.org>
parents: 1102
diff changeset
11 #define STBI_ONLY_JPEG 1
73808dce89e6 Disable formats other than PNG and JPEG from stb_image.
Matti Hamalainen <ccr@tnsp.org>
parents: 1102
diff changeset
12 #define STBI_ONLY_PNG 1
73808dce89e6 Disable formats other than PNG and JPEG from stb_image.
Matti Hamalainen <ccr@tnsp.org>
parents: 1102
diff changeset
13 //#define STBI_NO_HDR 1
73808dce89e6 Disable formats other than PNG and JPEG from stb_image.
Matti Hamalainen <ccr@tnsp.org>
parents: 1102
diff changeset
14
73808dce89e6 Disable formats other than PNG and JPEG from stb_image.
Matti Hamalainen <ccr@tnsp.org>
parents: 1102
diff changeset
15 // Other options, etc.
1046
7e54b2d08ce7 Add special debug error message function/macro that can be
Matti Hamalainen <ccr@tnsp.org>
parents: 1042
diff changeset
16 #ifndef DM_DEBUG
900
df2a9c635175 Cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 899
diff changeset
17 #define STBI_NO_FAILURE_STRINGS 1
1138
2e728c38a386 Define STBI_ASSERT(x) as dummy if DM_DEBUG is not enabled.
Matti Hamalainen <ccr@tnsp.org>
parents: 1135
diff changeset
18 #define STBI_ASSERT(x)
1046
7e54b2d08ce7 Add special debug error message function/macro that can be
Matti Hamalainen <ccr@tnsp.org>
parents: 1042
diff changeset
19 #endif
900
df2a9c635175 Cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 899
diff changeset
20 #define STBI_FAILURE_USERMSG 1
df2a9c635175 Cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 899
diff changeset
21
899
63fd1801f983 Mangle new stb_image to our purposes.
Matti Hamalainen <ccr@tnsp.org>
parents: 870
diff changeset
22 #define STB_IMAGE_IMPLEMENTATION 1
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
23 #define STBI_NO_STDIO 1
899
63fd1801f983 Mangle new stb_image to our purposes.
Matti Hamalainen <ccr@tnsp.org>
parents: 870
diff changeset
24
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
25 #include "stb_image.c"
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
26
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
27
1154
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
28 static Uint32
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
29 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
30 dmXrmask = 0xff000000,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
31 dmXgmask = 0x00ff0000,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
32 dmXbmask = 0x0000ff00,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
33 dmXamask = 0x000000ff;
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
34 #else
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
35 dmXrmask = 0x000000ff,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
36 dmXgmask = 0x0000ff00,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
37 dmXbmask = 0x00ff0000,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
38 dmXamask = 0xff000000;
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
39 #endif
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
40
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
41
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
42 SDL_Surface *dmCreateRGBSurfaceFrom(void *data,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
43 const int width, const int height,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
44 const int depth, const int pitch,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
45 const int rmask, const int gmask, const int bmask, const int amask)
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
46 {
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
47 // Create source surface from given data
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
48 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
49
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
50 // Create result conversion surface
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
51 SDL_Surface
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
52 *result = NULL,
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
53 *pixtmp = SDL_CreateRGBSurface(
1154
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
54 SDL_SWSURFACE | SDL_SRCALPHA,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
55 16, 16, 32,
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
56 dmXrmask, dmXgmask, dmXbmask, dmXamask);
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
57
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
58 if (tmp != NULL && pixtmp != NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
59 {
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
60 // Convert surface
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
61 result = SDL_ConvertSurface(tmp, pixtmp->format, SDL_SWSURFACE | SDL_SRCALPHA);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
62 SDL_FreeSurface(tmp);
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 if (pixtmp != NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
65 SDL_FreeSurface(pixtmp);
1102
e06abfde6c39 Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 1080
diff changeset
66
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
67 return result;
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
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
70
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
71 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
72 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
73 int yc;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
74 Uint8 *dst, *src;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
75 SDL_Surface *result;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
76 result = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 8, 0,0,0,0);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
77 if (result == NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
78 return NULL;
1102
e06abfde6c39 Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 1080
diff changeset
79
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
80 dst = result->pixels;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
81 src = data;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
82 for (yc = 0; yc < height; yc++)
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 memcpy(dst, src, width * sizeof(Uint8));
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
85 dst += result->pitch;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
86 src += pitch;
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 return result;
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
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
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
94 static int dmSTBIread(void *user, char *data, int size)
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 return dmfread(data, 1, size, (DMResource *) user);
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
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
99
899
63fd1801f983 Mangle new stb_image to our purposes.
Matti Hamalainen <ccr@tnsp.org>
parents: 870
diff changeset
100 static void dmSTBIskip(void *user, int n)
0
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 dmfseek((DMResource *) user, n, SEEK_CUR);
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
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
106 static int dmSTBIeof(void *user)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
107 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
108 return dmfeof((DMResource *) user);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
109 }
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
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
112 static const stbi_io_callbacks dmSTBICallbacks =
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 dmSTBIread,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
115 dmSTBIskip,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
116 dmSTBIeof,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
117 };
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 SDL_Surface *dmLoadImage(DMResource *file)
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 Uint32 rmask, gmask, bmask, amask;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
123 SDL_Surface *result = NULL;
963
1ffc48d0feaf Initialize variables so that we don't get garbage in error situations.
Matti Hamalainen <ccr@tnsp.org>
parents: 958
diff changeset
124 int width = 0, height = 0, comp = 0;
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
125 Uint8 *data;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
126
1042
c71fcf44b678 Image resources may get decoded multiple times, so seek to node start.
Matti Hamalainen <ccr@tnsp.org>
parents: 963
diff changeset
127 dmfseek(file, 0, SEEK_SET);
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
128 data = stbi_load_from_callbacks(&dmSTBICallbacks, file, &width, &height, &comp, 0);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
129
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
130 if (data == NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
131 {
1080
76b7d1d20545 Change message to debug.
Matti Hamalainen <ccr@tnsp.org>
parents: 1048
diff changeset
132 dmErrorDBGMsg(
958
985225a93aeb Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents: 950
diff changeset
133 "Error decoding image resource %p '%s' [%d, %d, %d]: %s\n",
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
134 file, file->filename, width, height, comp, stbi_failure_reason());
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
135 return NULL;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
136 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
137
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
138
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
139 switch (comp)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
140 {
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
141 case 4:
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
142 result = dmCreateRGBSurfaceFrom(data, width, height, comp * 8,
1154
494fa5998b65 Move RGBA mask definitions to static global variables that are
Matti Hamalainen <ccr@tnsp.org>
parents: 1138
diff changeset
143 width * comp, dmXrmask, dmXgmask, dmXbmask, dmXamask);
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
144 break;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
145
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
146 case 3:
1155
d46966ad3b08 Add note about the 24-bit RGBA masks being different.
Matti Hamalainen <ccr@tnsp.org>
parents: 1154
diff changeset
147 // These masks are different from the dmX*masks
757
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
148 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
149 rmask = 0x00ff0000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
150 gmask = 0x0000ff00;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
151 bmask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
152 amask = 0x00000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
153 #else
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
154 rmask = 0x000000ff;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
155 gmask = 0x0000ff00;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
156 bmask = 0x00ff0000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
157 amask = 0x00000000;
dd59a650a318 Fix 24-bit surface conversions in image loader.
Matti Hamalainen <ccr@tnsp.org>
parents: 0
diff changeset
158 #endif
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
159 result = dmCreateRGBSurfaceFrom(data, width, height, comp * 8,
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
160 width * comp, rmask, gmask, bmask, amask);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
161 break;
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 case 1:
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
164 result = dmCreatePaletteSurfaceFrom(data, width, height, width * comp);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
165 break;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
166 }
1102
e06abfde6c39 Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents: 1080
diff changeset
167
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
168 stbi_image_free(data);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
169
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
170 if (result == NULL)
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
171 {
1048
509e6ed3a24e Finishing touches to the DM_DEBUG stuff.
Matti Hamalainen <ccr@tnsp.org>
parents: 1046
diff changeset
172 dmErrorDBGMsg(
958
985225a93aeb Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents: 950
diff changeset
173 "Format conversion failed for image resource %p '%s' [%d, %d, %d].\n",
0
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
174 file, file->filename, width, height, comp);
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
175 }
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
176
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
177 return result;
32250b436bca Initial re-import.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
178 }