← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xserver-xorg-video-intel/utopic

« back to all changes in this revision

Viewing changes to src/sna/sna_damage.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-09-12 07:43:59 UTC
  • mfrom: (1.4.22)
  • Revision ID: package-import@ubuntu.com-20120912074359-i3h8ol6hoghbemoq
Tags: 2:2.20.7-0ubuntu1
Merge from unreleased debian git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sna/sna_damage.c
658
658
 
659
659
        ErrorF("  = %s\n",
660
660
               _debug_describe_damage(damage_buf, sizeof(damage_buf), damage));
 
661
        assert(RegionNumRects(&damage->region));
661
662
        assert(damage->region.extents.x2 > damage->region.extents.x1);
662
663
        assert(damage->region.extents.y2 > damage->region.extents.y1);
663
664
 
741
742
 
742
743
        ErrorF("  = %s\n",
743
744
               _debug_describe_damage(damage_buf, sizeof(damage_buf), damage));
744
 
        assert(damage->region.extents.x2 > damage->region.extents.x1);
745
 
        assert(damage->region.extents.y2 > damage->region.extents.y1);
 
745
        if (RegionNumRects(&damage->region)) {
 
746
                assert(damage->region.extents.x2 > damage->region.extents.x1);
 
747
                assert(damage->region.extents.y2 > damage->region.extents.y1);
 
748
        }
746
749
 
747
750
        return damage;
748
751
}
828
831
 
829
832
        ErrorF("  = %s\n",
830
833
               _debug_describe_damage(damage_buf, sizeof(damage_buf), damage));
831
 
        assert(damage->region.extents.x2 > damage->region.extents.x1);
832
 
        assert(damage->region.extents.y2 > damage->region.extents.y1);
 
834
        if (RegionNumRects(&damage->region)) {
 
835
                assert(damage->region.extents.x2 > damage->region.extents.x1);
 
836
                assert(damage->region.extents.y2 > damage->region.extents.y1);
 
837
        }
833
838
 
834
839
        return damage;
835
840
}
912
917
 
913
918
        ErrorF("  = %s\n",
914
919
               _debug_describe_damage(damage_buf, sizeof(damage_buf), damage));
915
 
        assert(damage->region.extents.x2 > damage->region.extents.x1);
916
 
        assert(damage->region.extents.y2 > damage->region.extents.y1);
 
920
        if (RegionNumRects(&damage->region)) {
 
921
                assert(damage->region.extents.x2 > damage->region.extents.x1);
 
922
                assert(damage->region.extents.y2 > damage->region.extents.y1);
 
923
        }
917
924
 
918
925
        return damage;
919
926
}
940
947
 
941
948
        ErrorF("  = %s\n",
942
949
               _debug_describe_damage(damage_buf, sizeof(damage_buf), damage));
 
950
        assert(RegionNumRects(&damage->region));
943
951
        assert(damage->region.extents.x2 > damage->region.extents.x1);
944
952
        assert(damage->region.extents.y2 > damage->region.extents.y1);
945
953