286236 - Cleanup nsImageWin::ConvertDDBtoDIB, remove BuildDIB

Status: RESOLVED FIXED

(Core Graveyard :: GFX: Win32, defect)

Description

[ArronM (:paper)]

1/2 the code in ConvertDDBtoDIB is redundant.

Currently, ConvertDDBtoDIB does these useless things:

- temporarily stores width & height of mBHead
- Deletes mBHead
- recalculates mBHead, mNumBytesPixel (via BuildDIB), mRowBytes, and mImageSize.
All of these will not change in value, since they are being recalculated based
on the same image info we had in init(), when we first calculated them all.

All this code can be removed, with the exception of mImageSize being recalculated.

Also, the header comments for this function in nsImageWin.h and nsImageWin.cpp
are incorrect.

I'll wait for the "Depends On" bugs to be checked in before attaching a patch.

Comment 1

[ArronM (:paper)]

Attachment: First attempt

Comment 2

[ArronM (:paper)]

Attachment: Cleanup ConvertDDBtoDIB

Comment 3

[Ere Maijala (slow)]

Comment on attachment 179797 [details] [diff] [review]
Cleanup ConvertDDBtoDIB

Nice :)

Comment 4

[Asa Dotzler [:asa]]

Comment on attachment 179797 [details] [diff] [review]
Cleanup ConvertDDBtoDIB

a=asa

Comment 5

[ArronM (:paper)]

Checking in gfx/src/windows/nsImageWin.cpp;
/cvsroot/mozilla/gfx/src/windows/nsImageWin.cpp,v  <--  nsImageWin.cpp
new revision: 3.147; previous revision: 3.146
done
Checking in gfx/src/windows/nsImageWin.h;
/cvsroot/mozilla/gfx/src/windows/nsImageWin.h,v  <--  nsImageWin.h
new revision: 3.64; previous revision: 3.63
done