Overview
Comment: | Correct the way that picture sizes are decided |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
764ce30c41c4f7bdb42acfffdab0b516 |
User & Date: | user on 2018-04-13 23:26:07 |
Other Links: | manifest | tags |
Context
2018-04-16
| ||
00:14 | Add some starting for loading class files (not much yet) check-in: e701e7c58f user: user tags: trunk | |
2018-04-13
| ||
23:26 | Correct the way that picture sizes are decided check-in: 764ce30c41 user: user tags: trunk | |
21:19 | Add the "sqlFile" resource, and correct the gamma correction check-in: a4882ad0b9 user: user tags: trunk | |
Changes
Modified picture.c from [399282ff2d] to [bddcfb3e17].
︙ | ︙ | |||
110 111 112 113 114 115 116 | } t++; if(!--len) return; pix+=8; } } | | | < | | 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | } t++; if(!--len) return; pix+=8; } } static Uint16 decide_picture_size(int nwantsize,const Uint8*wantsize,const Uint16*havesize,int n) { int i,j; if(!nwantsize) fatal("Unable to determine what picture size is wanted\n"); for(i=0;i<nwantsize;i++) if(havesize[j=wantsize[i]]==n) return j; for(i=*wantsize;i;--i) if(havesize[i]) return i; fatal("Unable to determine what picture size is wanted\n"); } static void load_one_picture_sub(FILE*fp,int size,int meth) { Uint8*p=curpic; int c,n,t,x,y; if(meth==15) { |
︙ | ︙ | |||
206 207 208 209 210 211 212 213 214 215 216 217 218 219 | void load_pictures(void) { sqlite3_stmt*st=0; FILE*fp; Uint8 wantsize[32]; Uint8 nwantsize=0; Uint8 altImage; Uint16 havesize[256]; char*nam=sqlite3_mprintf("%s.xclass",basefilename); const char*v; int i,j,n; if(!nam) fatal("Allocation failed\n"); fprintf(stderr,"Loading pictures...\n"); fp=fopen(nam,"r"); | > | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | void load_pictures(void) { sqlite3_stmt*st=0; FILE*fp; Uint8 wantsize[32]; Uint8 nwantsize=0; Uint8 altImage; Uint8 havesize1[256]; Uint16 havesize[256]; char*nam=sqlite3_mprintf("%s.xclass",basefilename); const char*v; int i,j,n; if(!nam) fatal("Allocation failed\n"); fprintf(stderr,"Loading pictures...\n"); fp=fopen(nam,"r"); |
︙ | ︙ | |||
258 259 260 261 262 263 264 265 | j=0; } i=fgetc(fp)<<16; i|=fgetc(fp)<<24; i|=fgetc(fp)<<0; i|=fgetc(fp)<<8; if(j) { i-=j=fgetc(fp)&15; | > | > > < | | 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 | j=0; } i=fgetc(fp)<<16; i|=fgetc(fp)<<24; i|=fgetc(fp)<<0; i|=fgetc(fp)<<8; if(j) { memset(havesize1,0,256); i-=j=fgetc(fp)&15; while(j--) havesize1[fgetc(fp)&255]=1; fseek(fp,i-1,SEEK_CUR); for(i=1;i<256;i++) if(havesize1[j]) for(j=i+i;j<256;j+=i) havesize1[j]=1; for(j=1;j<256;j++) havesize[j]+=havesize1[j]; } else { fseek(fp,i,SEEK_CUR); } } nomore1: if(!n) fatal("Cannot find any pictures in this puzzle set\n"); free(nam); sqlite3_finalize(st); rewind(fp); for(i=255;i;--i) if(havesize[i]) { curpic=malloc(i*i); break; } if(!curpic) fatal("Allocation failed\n"); picture_size=decide_picture_size(nwantsize,wantsize,havesize,n); if(sqlite3_prepare_v2(userdb,"SELECT `ID`, `OFFSET` FROM `PICTURES`;",-1,&st,0)) fatal("Unable to prepare SQL statement while loading pictures: %s\n",sqlite3_errmsg(userdb)); optionquery[1]=Q_screenFlags; v=xrm_get_resource(resourcedb,optionquery,optionquery,2); i=v&&strchr(v,'h'); picts=SDL_CreateRGBSurface((i?SDL_HWSURFACE:SDL_SWSURFACE)|SDL_SRCCOLORKEY,picture_size<<4,picture_size*((n+15)>>4),8,0,0,0,0); if(!picts) fatal("Error allocating surface for pictures: %s\n",SDL_GetError()); |
︙ | ︙ |