commit 1fcd51e6b2a210a37b9b9c2cfb82e1be7196e42a
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 05 15:50:27 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 05 15:50:27 2011 +0000
tree a4484338560ed16adffe22f52a2cb2401901208d
parent 62f465940d57139dfd83e2aef67081017a232417

add template macro to "safely" perform casts w/o breaking strict-aliasing
fix aliasing warnings



git-svn-id: http://skia.googlecode.com/svn/trunk@674 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/SkGrFontScaler.cpp

diff --git a/src/gpu/SkGrFontScaler.cpp b/src/gpu/SkGrFontScaler.cpp
index 5c88717..3d57aa8 100644
--- a/src/gpu/SkGrFontScaler.cpp
+++ b/src/gpu/SkGrFontScaler.cpp
@@ -23,12 +23,12 @@
 public:
     explicit SkGrDescKey(const SkDescriptor& desc);
     virtual ~SkGrDescKey();
-    
+
 protected:
     // overrides
     virtual bool lt(const GrKey& rh) const;
     virtual bool eq(const GrKey& rh) const;
-    
+
 private:
     SkDescriptor* fDesc;
     enum {
@@ -42,7 +42,7 @@
 SkGrDescKey::SkGrDescKey(const SkDescriptor& desc) : GrKey(desc.getChecksum()) {
     size_t size = desc.getLength();
     if (size <= sizeof(fStorage)) {
-        fDesc = (SkDescriptor*)fStorage;
+        fDesc = GrTCast<SkDescriptor*>(fStorage);
     } else {
         fDesc = SkDescriptor::Alloc(size);
     }
@@ -50,7 +50,7 @@
 }
 
 SkGrDescKey::~SkGrDescKey() {
-    if (fDesc != (SkDescriptor*)fStorage) {
+    if (fDesc != GrTCast<SkDescriptor*>(fStorage)) {
         SkDescriptor::Free(fDesc);
     }
 }
@@ -97,7 +97,7 @@
                                               GrGlyph::UnpackFixedY(packed));
     bounds->setXYWH(glyph.fLeft, glyph.fTop, glyph.fWidth, glyph.fHeight);
     return true;
-    
+
 }
 
 bool SkGrFontScaler::getPackedGlyphImage(GrGlyph::PackedID packed,
@@ -127,7 +127,7 @@
 }
 
 bool SkGrFontScaler::getGlyphPath(uint16_t glyphID, GrPath* path) {
-    
+
     const SkGlyph& glyph = fStrike->getGlyphIDMetrics(glyphID);
     const SkPath* skPath = fStrike->findPath(glyph);
     if (skPath) {