Index: picture.c
==================================================================
--- picture.c
+++ picture.c
@@ -112,16 +112,15 @@
     if(!--len) return;
     pix+=8;
   }
 }
 
-static Uint16 decide_picture_size(int nwantsize,const Uint8*wantsize,const Uint16*havesize) {
+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]]) return j;
-  for(i=0;i<nwantsize;i++) for(j=2;j<wantsize[i];j++) if(wantsize[i]%j==0 && havesize[wantsize[i]/j]) return wantsize[i];
-  for(i=*wantsize;i;i--) for(j=1;j<i;j++) if(i%j==0 && havesize[i/j]) return i;
+  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;
@@ -208,10 +207,11 @@
   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");
@@ -260,13 +260,16 @@
     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--) ++havesize[fgetc(fp)&255];
+      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:
@@ -277,12 +280,11 @@
   for(i=255;i;--i) if(havesize[i]) {
     curpic=malloc(i*i);
     break;
   }
   if(!curpic) fatal("Allocation failed\n");
-  for(i=0;i<256;i++) havesize[i]=(havesize[i]==n)?1:0;
-  picture_size=decide_picture_size(nwantsize,wantsize,havesize);
+  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');