Ubuntu
compiz package

Merge lp:~vanvugt/ubuntu/quantal/compiz/fix-1071238 into lp:ubuntu/raring/compiz

  1. Quantal (12.10)
  2. fix-1071238
  3. Merge into raring
Proposed by Daniel van Vugt on 2012-10-25
Status: Superseded
Proposed branch: lp:~vanvugt/ubuntu/quantal/compiz/fix-1071238
Merge into: lp:ubuntu/raring/compiz
Diff against target: 33 lines (+8/-8)
1 file modified
debian/patches/100_expo_layout.patch (+8/-8)
To merge this branch: bzr merge lp:~vanvugt/ubuntu/quantal/compiz/fix-1071238
Reviewer Review Type Date Requested Status
Daniel van Vugt (community) Resubmit on 2012-11-08
Sam Spilsbury (community) Approve on 2012-10-25
Ubuntu branches 2012-10-25 Pending
Review via email: mp+131375@code.launchpad.net

This proposal has been superseded by a proposal from 2012-11-08.

Commit Message

Never compare floats directly. They will rarely be precisely equal except
under tightly controlled conditions. This fixes test case failures.
(LP: #1071238)

To post a comment you must log in.
Sam Spilsbury (smspillaz) wrote :

Thanks. Can you cherry pick this into lp:~compiz-team/compiz/ubuntu as well?

review: Approve
Daniel van Vugt (vanvugt) wrote :

smspillaz: sil2100 just asked me to get you to merge that branch into lp:ubuntu/compiz instead...

Daniel van Vugt (vanvugt) wrote :

... or don't bother. sil2100 now says didrocks will review the branches and combine them.

Daniel van Vugt (vanvugt) wrote :

Resubmit. The offending code has now moved to lp:compiz

review: Resubmit

Unmerged revisions

3323. By Daniel van Vugt on 2012-10-25

Never compare floats directly. They will rarely be precisely equal except
under tightly controlled conditions. This fixes test case failures.
(LP: #1071238)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/100_expo_layout.patch'
2--- debian/patches/100_expo_layout.patch 2012-09-13 04:59:17 +0000
3+++ debian/patches/100_expo_layout.patch 2012-10-25 10:53:24 +0000
4@@ -2392,10 +2392,10 @@
5 + RecordProperty ("worldScaleFactorX", worldScaleFactorX);
6 + RecordProperty ("worldScaleFactorY", worldScaleFactorY);
7 +
8-+ EXPECT_EQ (offsetInWorldX, offset.animationParameters[index].offsetInWorldX);
9-+ EXPECT_EQ (offsetInWorldY, offset.animationParameters[index].offsetInWorldY);
10-+ EXPECT_EQ (worldScaleFactorX, offset.animationParameters[index].worldScaleFactorX);
11-+ EXPECT_EQ (worldScaleFactorY, offset.animationParameters[index].worldScaleFactorY);
12++ EXPECT_FLOAT_EQ (offsetInWorldX, offset.animationParameters[index].offsetInWorldX);
13++ EXPECT_FLOAT_EQ (offsetInWorldY, offset.animationParameters[index].offsetInWorldY);
14++ EXPECT_FLOAT_EQ (worldScaleFactorX, offset.animationParameters[index].worldScaleFactorX);
15++ EXPECT_FLOAT_EQ (worldScaleFactorY, offset.animationParameters[index].worldScaleFactorY);
16 +}
17 +
18 +TEST_F (ExpoWallOffsetTest, TestNoOffsetIfOutputIsNotOrigin)
19@@ -2416,10 +2416,10 @@
20 + worldScaleFactorY,
21 + 1.0);
22 +
23-+ EXPECT_EQ (offsetInWorldX, 0.0f);
24-+ EXPECT_EQ (offsetInWorldY, 0.0f);
25-+ EXPECT_EQ (worldScaleFactorX, 1.0f);
26-+ EXPECT_EQ (worldScaleFactorY, 1.0f);
27++ EXPECT_FLOAT_EQ (offsetInWorldX, 0.0f);
28++ EXPECT_FLOAT_EQ (offsetInWorldY, 0.0f);
29++ EXPECT_FLOAT_EQ (worldScaleFactorX, 1.0f);
30++ EXPECT_FLOAT_EQ (worldScaleFactorY, 1.0f);
31 +}
32 +
33 +INSTANTIATE_TEST_CASE_P (ExpoAnimationOffsetTest,

Subscribers

People subscribed via source and target branches