[stsf-commit] stsf/STFontServer/src handler.c,1.5,1.6

[Alexander Gelfenbain]

Committed by: adg


Index: handler.c
===================================================================
RCS file: /cvs/stsf/stsf/STFontServer/src/handler.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/handler.c	25 May 2004 21:08:21 -0000	1.5
+++ b/handler.c	25 May 2004 21:34:49 -0000	1.6
@@ -448,7 +448,7 @@
                   } 
               }
 
-              memcpy(bp+fsc->psize, &metrics, sizeof(ScaledGlyphData));
+              memcpy(bp, &metrics, sizeof(ScaledGlyphData));
               offset = SharedCacheAllocate(cache, ghandle, nbytes + sizeof(ScaledGlyphData) + fsc->psize);
 
             ret:
@@ -801,7 +801,7 @@
                                   goto pass2;
                               } else {
                                   nput++;
-                                  memcpy(ptr+fsc->psize, &metrics, sizeof(ScaledGlyphData));
+                                  memcpy(ptr, &metrics, sizeof(ScaledGlyphData));
                                   offsets[i] = SharedCacheAllocate(cache, ghandle, nbytes + sizeof(ScaledGlyphData) + fsc->psize);
                               }
                           } 
@@ -826,7 +826,7 @@
                               ret = FSRenderGlyph(fs, q->gk[i].instanceID, q->gk[i].glyphID, q->gk[i].fracdelta, &metrics, &nbytes, ptr + sizeof(ScaledGlyphData) + fsc->psize);
                               if (ret == ST_OK) {
                                   nput++;
-                                  memcpy(ptr+fsc->psize, &metrics, sizeof(ScaledGlyphData));
+                                  memcpy(ptr, &metrics, sizeof(ScaledGlyphData));
                                   offsets[i] = SharedCacheAllocate(cache, ghandle, nbytes + sizeof(ScaledGlyphData)+fsc->psize);
                               }
                           }