Changeset 243 for trunk/src/helpers/gpih.c

Timestamp:

Jan 29, 2003, 7:41:39 PM (23 years ago)

Author:

umoeller

Message:

New build system, multimedia, other misc fixes.

File:

• trunk/src/helpers/gpih.c (modified) (3 diffs)

trunk/src/helpers/gpih.c

@@ -737 +737 @@
     {
         ULONG cLines = strhCount(pcsz, '\n') + 1;
-        cyString = cLines * (pfm->lMaxBaselineExt + pfm->lExternalLeading);
+        cyString = cLines * (pfm->lMaxBaselineExt + pfm->lMaxDescender + pfm->lExternalLeading);
 
         if (fl & DT_VCENTER)
-            ptlRun.y += (cyRect - cyString) / 2;
+            ptlRun.y = (cyRect - cyString) / 2;
         else
-            ptlRun.y += cyRect - cyString;
+            ptlRun.y = cyString;
     }
 
@@ -789 +789 @@
         ptlRun.y -= pfm->lExternalLeading;
 
+        if (!*pNext)
+            break;
+
         if (*pNext == '\r')
             pNext++;
-        pThis = pNext;
+        pThis = ++pNext;
     }
 }
@@ -2553 +2556 @@
 LONG gpihStretchBitmap(HPS hpsTarget,       // in: memory PS to copy bitmap to
                        HBITMAP hbmSource,   // in: bitmap to be copied into hpsTarget (must be free)
-                       PRECTL prclSource,   // in: source rectangle -- if NULL, use size of bitmap
-                       PRECTL prclTarget,   // in: target rectangle (req.)
+                       PRECTL prclSource,   // in: source rectangle -- if NULL, use size of source bmp
+                       PRECTL prclTarget,   // in: target rectangle (required)
                        BOOL fProportional)  // in: preserve proportions when stretching?
 {