hrev54774 adds 1 changeset to branch 'master'
old head: 6467297a1b2e6aed10add9aadae941d66d3451fe
new head: efc042ff484bb6125a8a533c7d942edb7b2de9bc
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=efc042ff484b+%5E6467297a1b2e
----------------------------------------------------------------------------
efc042ff484b: Window: Fix dead assignment
Fix value stored to 'maxWidth' or 'maxHeight' is never read
when maxWidth > fMaxWidth or maxHeight > fMaxHeight.
Pointed out by Clang Static Analyzer.
Change-Id: I2bd0b8712d47e64298c0f915f24f7f1c87f4362e
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3474
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
Reviewed-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54774
Commit: efc042ff484bb6125a8a533c7d942edb7b2de9bc
URL: https://git.haiku-os.org/haiku/commit/?id=efc042ff484b
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Tue Nov 17 10:56:49 2020 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxx>
Commit-Date: Thu Dec 10 11:40:20 2020 UTC
----------------------------------------------------------------------------
1 file changed, 3 insertions(+), 5 deletions(-)
src/kits/interface/Window.cpp | 8 +++-----
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index 4af569f81b..4786ed0e81 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -1234,7 +1234,7 @@ FrameMoved(origin);
_AdoptResize();
FrameResized(width, height);
}
-
+
// draw
int32 count = infos.CountItems();
for (int32 i = 0; i < count; i++) {
@@ -1517,13 +1517,11 @@ BWindow::SetZoomLimits(float maxWidth, float maxHeight)
// TODO: What about locking?!?
if (maxWidth > fMaxWidth)
maxWidth = fMaxWidth;
- else
- fMaxZoomWidth = maxWidth;
+ fMaxZoomWidth = maxWidth;
if (maxHeight > fMaxHeight)
maxHeight = fMaxHeight;
- else
- fMaxZoomHeight = maxHeight;
+ fMaxZoomHeight = maxHeight;
}
