Changeset 140 for branches

Timestamp:

Dec 30, 2023, 2:20:44 PM (20 months ago)

Author:

erdmann

Message:

partly revert the changes for "fix a trap that reports on my system in CWMMCls.LOG as "Trap occured in createBMPObjectProc, file c/c_image/cwimage.c, around line 245."" Otherwise, lighttable folders containing images will flicker. I assume that the memory freeing fix in SVN rev 139 fixed the real problem.

File:

• branches/v2.9_Lars/classes/c/c_image/cwimage.c (modified) (5 diffs)

branches/v2.9_Lars/classes/c/c_image/cwimage.c

@@ -151 +151 @@
           case ACKEY_CREATE_SMALLBITMAP:
             {
+              BOOL bLoaded=FALSE;
               HBITMAP hbm;
               PCREATEBMPINFO pCreateBMP=PVOIDFROMMP(mp1);
@@ -199 +200 @@
 
                   /* Check if in the meantime the bitmap was created */
-                  if(!_hBitmapSmall && _hBitmap) {
+                  if(!_hBitmapSmall) {
                     /*
                        FIXME:
@@ -206 +207 @@
 
                        Use a private work alike for wpQueryBitmapHandle instead???
-                    */
-
+                       
+                       Check if bitmap data already loaded. Keep the info so we don't discard the bitmap later on. Another
+                       function may have requested the bitmap before. During wpQueryBitmapHandle() a normal size bitmap
+                       is always created. We don't want to have memory wasted by the big one so it's discarded afterwards.
+                       Not perfect, but works at the moment. Will be revamped later with automatic bitmap deletion. */
+                    if(_hBitmap)
+                      bLoaded=TRUE;
+                    
                     if(_wpQueryBitmapHandle(pCreateBMP->wpObject,
                                             &hbm,
@@ -218 +225 @@
                       _hBitmapSmall=hbm;
                       _ulSizeSmallBitmap=pCreateBMP->ulHeight;
+                      if(!bLoaded) {
                       /* Discard the large bitmap now, we don't need it any more as we have
                          the small one. */
                       GpiDeleteBitmap(_hBitmap);
                       _hBitmap=NULLHANDLE;
+                      }
                     }/* _wpQueryBitmapHandle() */
                   }
@@ -230 +239 @@
                 }/* for */
               }/* Try */
-              CATCH(BITMAP_OBJECT)
-                {
+              CATCH(BITMAP_OBJECT) {
                   SysWriteToTrapLog("\nTrap occured in %s, file %s, around line %d.\n",
                                     __FUNCTION__, __FILE__, __LINE__);
-                } END_CATCH;
-                _wpUnlockObject(pCreateBMP->wpObject);
-                //        WinSendMsg(pCreateBMP->hwndCnr, CM_INVALIDATERECORD,MPFROMP(&pmrcToRefresh),MPFROM2SHORT(1,CMA_NOREPOSITION));
-                //   _wp_FreeMem(wpObject, (PBYTE)pCreateBMP);
-                free((PBYTE)pCreateBMP);
-
-                return (MRESULT) FALSE;
+              } END_CATCH;
+              _wpUnlockObject(pCreateBMP->wpObject);
+              //        WinSendMsg(pCreateBMP->hwndCnr, CM_INVALIDATERECORD,MPFROMP(&pmrcToRefresh),MPFROM2SHORT(1,CMA_NOREPOSITION));
+              //   _wp_FreeMem(wpObject, (PBYTE)pCreateBMP);
+              free((PBYTE)pCreateBMP);
+
+              return (MRESULT) FALSE;
             }/* case ACKEY_CREATE_SMALLBITMAP */
           case ACKEY_QUERY_BITMAPINFO: