diff options
Diffstat (limited to 'textproc/helpdeco/patches/patch-aa')
| -rw-r--r-- | textproc/helpdeco/patches/patch-aa | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/textproc/helpdeco/patches/patch-aa b/textproc/helpdeco/patches/patch-aa new file mode 100644 index 00000000000..1424204f43b --- /dev/null +++ b/textproc/helpdeco/patches/patch-aa @@ -0,0 +1,94 @@ +$NetBSD: patch-aa,v 1.1.1.1 2001/05/23 15:47:45 agc Exp $ + +--- splitmrb.c.orig Fri Sep 13 00:11:54 1996 ++++ splitmrb.c Sat May 12 23:25:04 2001 +@@ -216,14 +216,10 @@ + int i,l,n; + typedef struct + { +- unsigned char c1,c2,c3; +- unsigned int x,y,w,h; +- unsigned long hash; +- } +- HOTSPOT; +-#if sizeof(HOTSPOT)!=15 +-#error Compile byte aligned ! +-#endif ++ u_int8_t c1,c2,c3; ++ u_int16_t x,y,w,h; ++ u_int32_t hash; ++ } HOTSPOT __attribute__((packed)); + HOTSPOT *hotspot; + char name[80]; + char buffer[128]; +@@ -308,7 +304,7 @@ + while(l>0&&filename[l-1]!='\\'&&filename[l-1]!='/'&&filename[l-1]!=':') l--; + m=l; + while(filename[l]!='\0'&&filename[l]!='.') l++; +- if(filename[l]=='\0') strcpy(filename+l,".MRB"); ++ if(filename[l]=='\0') strcpy(filename+l,".mrb"); + f=fopen(filename,"rb"); + if(!f) + { +@@ -331,7 +327,7 @@ + fseek(f,offset,SEEK_SET); + byType=getc(f); // type of picture: 5=DDB, 6=DIB, 8=METAFILE + byPacked=getc(f); // packing method: 0=unpacked, 1=RunLen, 2=LZ77 +- if(byType==6||byType==5&&byPacked<2) ++ if(byType==6||(byType==5&&byPacked<2)) + { + memset(&bmfh,0,sizeof(bmfh)); + memset(&bmih,0,sizeof(bmih)); +@@ -378,17 +374,17 @@ + sprintf(filename+l,".%03d",j); + if(w==96&&h==48&&!res[0]) + { +- strcpy(filename+l,".CGA"); ++ strcpy(filename+l,".cga"); + res[0]=TRUE; + } + else if(w==96&&h==72&&!res[1]) + { +- strcpy(filename+l,".EGA"); ++ strcpy(filename+l,".ega"); + res[1]=TRUE; + } + else if(w==96&&h==96&&!res[2]) + { +- strcpy(filename+l,".VGA"); ++ strcpy(filename+l,".vga"); + res[2]=TRUE; + } + else if(w==120&&h==120&&!res[3]) +@@ -398,12 +394,12 @@ + } + else if(w==72&&h==72&&!res[4]) + { +- strcpy(filename+l,".MAC"); ++ strcpy(filename+l,".mac"); + res[4]=TRUE; + } + else if(!res[6]) + { +- strcpy(filename+l,".BMP"); ++ strcpy(filename+l,".bmp"); + res[6]=TRUE; + } + fTarget=fopen(filename+m,"wb"); +@@ -472,7 +468,6 @@ + } + else if(byType==8) // Windows MetaFile + { +- APMFILEHEADER afh; + unsigned short *wp; + + memset(&afh,0,sizeof(afh)); +@@ -512,7 +507,7 @@ + for(k=0;k<10;k++) afh.wChecksum^=*wp++; + if(!res[5]) + { +- strcpy(filename+l,".WMF"); ++ strcpy(filename+l,".wmf"); + res[5]=TRUE; + } + else |