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
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) Needs Resubmitting
Sam Spilsbury (community) Approve
Ubuntu branches 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.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

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

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

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

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

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

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

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

review: Needs Resubmitting

Unmerged revisions

3323. By Daniel van Vugt

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
=== modified file 'debian/patches/100_expo_layout.patch'
--- debian/patches/100_expo_layout.patch 2012-09-13 04:59:17 +0000
+++ debian/patches/100_expo_layout.patch 2012-10-25 10:53:24 +0000
@@ -2392,10 +2392,10 @@
2392+ RecordProperty ("worldScaleFactorX", worldScaleFactorX);2392+ RecordProperty ("worldScaleFactorX", worldScaleFactorX);
2393+ RecordProperty ("worldScaleFactorY", worldScaleFactorY);2393+ RecordProperty ("worldScaleFactorY", worldScaleFactorY);
2394+2394+
2395+ EXPECT_EQ (offsetInWorldX, offset.animationParameters[index].offsetInWorldX);2395+ EXPECT_FLOAT_EQ (offsetInWorldX, offset.animationParameters[index].offsetInWorldX);
2396+ EXPECT_EQ (offsetInWorldY, offset.animationParameters[index].offsetInWorldY);2396+ EXPECT_FLOAT_EQ (offsetInWorldY, offset.animationParameters[index].offsetInWorldY);
2397+ EXPECT_EQ (worldScaleFactorX, offset.animationParameters[index].worldScaleFactorX);2397+ EXPECT_FLOAT_EQ (worldScaleFactorX, offset.animationParameters[index].worldScaleFactorX);
2398+ EXPECT_EQ (worldScaleFactorY, offset.animationParameters[index].worldScaleFactorY);2398+ EXPECT_FLOAT_EQ (worldScaleFactorY, offset.animationParameters[index].worldScaleFactorY);
2399+}2399+}
2400+2400+
2401+TEST_F (ExpoWallOffsetTest, TestNoOffsetIfOutputIsNotOrigin)2401+TEST_F (ExpoWallOffsetTest, TestNoOffsetIfOutputIsNotOrigin)
@@ -2416,10 +2416,10 @@
2416+ worldScaleFactorY,2416+ worldScaleFactorY,
2417+ 1.0);2417+ 1.0);
2418+2418+
2419+ EXPECT_EQ (offsetInWorldX, 0.0f);2419+ EXPECT_FLOAT_EQ (offsetInWorldX, 0.0f);
2420+ EXPECT_EQ (offsetInWorldY, 0.0f);2420+ EXPECT_FLOAT_EQ (offsetInWorldY, 0.0f);
2421+ EXPECT_EQ (worldScaleFactorX, 1.0f);2421+ EXPECT_FLOAT_EQ (worldScaleFactorX, 1.0f);
2422+ EXPECT_EQ (worldScaleFactorY, 1.0f);2422+ EXPECT_FLOAT_EQ (worldScaleFactorY, 1.0f);
2423+}2423+}
2424+2424+
2425+INSTANTIATE_TEST_CASE_P (ExpoAnimationOffsetTest,2425+INSTANTIATE_TEST_CASE_P (ExpoAnimationOffsetTest,

Subscribers

People subscribed via source and target branches