Strong mode fixes

brendan-duncan · Sep 15, 2017 · 3740557 · 3740557
1 parent a26fd3f
commit 3740557
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 34 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -0,0 +1,2 @@
+analyzer:
+  strong-mode: true
diff --git a/lib/src/bitmap_font.dart b/lib/src/bitmap_font.dart
@@ -115,6 +115,10 @@ class BitmapFont {
   }
 
 
+  Iterable<XML.XmlElement> _childElements(XML.XmlNode n) =>
+    n.children.where((c) => c is XML.XmlElement).map((c) => c as XML.XmlElement);
+
+
   void _parseFnt(XML.XmlDocument xml, Map<int, Image> fontPages,
                  [Archive arc]) {
     if (xml.children.length != 1) {
@@ -123,10 +127,7 @@ class BitmapFont {
 
     var font = xml.children[0];
 
-    for (var c in font.children) {
-      if (c is! XML.XmlElement) {
-        continue;
-      }
+    for (var c in _childElements(font)) {
       String name = c.name.toString();
       if (name == 'info') {
         for (XML.XmlAttribute a in c.attributes) {
@@ -201,10 +202,7 @@ class BitmapFont {
           }
         }
       } else if (name == 'pages') {
-        for (var page in c.children) {
-          if (page is! XML.XmlElement) {
-            continue;
-          }
+        for (var page in _childElements(c)) {
           int id = int.parse(page.getAttribute('id'));
           String filename = page.getAttribute('file');
 
@@ -225,10 +223,7 @@ class BitmapFont {
           }
         }
       } else if (name == 'kernings') {
-        for (var kerning in c.children) {
-          if (kerning is! XML.XmlElement) {
-            continue;
-          }
+        for (var kerning in _childElements(c)) {
           int first = int.parse(kerning.getAttribute('first'));
           int second = int.parse(kerning.getAttribute('second'));
           int amount = int.parse(kerning.getAttribute('amount'));
@@ -241,16 +236,10 @@ class BitmapFont {
       }
     }
 
-    for (var c in font.children) {
-      if (c is! XML.XmlElement) {
-        continue;
-      }
+    for (var c in _childElements(font)) {
       String name = c.name.toString();
       if (name == 'chars') {
-        for (var char in c.children) {
-          if (char is! XML.XmlElement) {
-            continue;
-          }
+        for (var char in _childElements(c)) {
           int id = int.parse(char.getAttribute('id'));
           int x = int.parse(char.getAttribute('x'));
           int y = int.parse(char.getAttribute('y'));
@@ -288,10 +277,10 @@ class BitmapFont {
   }
 
   XML.XmlDocument _parseTextFnt(String content) {
-    var children = [];
-    var pageList = [];
-    var charList = [];
-    var kerningList = [];
+    var children = <XML.XmlNode>[];
+    var pageList = <XML.XmlNode>[];
+    var charList = <XML.XmlNode>[];
+    var kerningList = <XML.XmlNode>[];
     var charsAttrs;
     var kerningsAttrs;
 
@@ -361,8 +350,8 @@ class BitmapFont {
     return doc;
   }
 
-  List _parseParameters(List<String> tk) {
-    var params = [];
+  List<XML.XmlAttribute> _parseParameters(List<String> tk) {
+    var params = <XML.XmlAttribute>[];
     for (int ti = 1; ti < tk.length; ++ti) {
       if (tk[ti].isEmpty) {
         continue;

diff --git a/lib/src/formats/psd/layer_data/psd_layer_additional_data.dart b/lib/src/formats/psd/layer_data/psd_layer_additional_data.dart
@@ -4,6 +4,6 @@ class PsdLayerAdditionalData extends PsdLayerData {
   InputBuffer data;
 
   PsdLayerAdditionalData(String tag, InputBuffer data) :
-    super.type(tag),
-    this.data = data;
+    this.data = data,
+    super.type(tag);
 }
diff --git a/lib/src/formats/psd/psd_layer.dart b/lib/src/formats/psd/psd_layer.dart
@@ -145,7 +145,7 @@ class PsdLayer {
 
         // Layer effects data
         if (tag == 'lrFX') {
-          var fxData = additionalData['lrFX'];
+          var fxData = (additionalData['lrFX'] as PsdLayerAdditionalData);
           var data = new InputBuffer.from(fxData.data);
           int version = data.readUint16();
           int numFx = data.readUint16();

diff --git a/lib/src/formats/tiff/tiff_entry.dart b/lib/src/formats/tiff/tiff_entry.dart
@@ -21,14 +21,14 @@ class TiffEntry {
 
   bool get isString => type == TYPE_ASCII;
 
-  readValue(InputBuffer p) {
+  int readValue(InputBuffer p) {
     p.offset = valueOffset;
     return _readValue(p);
   }
 
-  List readValues(InputBuffer p) {
+  List<int> readValues(InputBuffer p) {
     p.offset = valueOffset;
-    List values = [];
+    var values = <int>[];
     for (int i = 0; i < numValues; ++i) {
       values.add(_readValue(p));
     }
@@ -43,7 +43,7 @@ class TiffEntry {
     return new String.fromCharCodes(readValues(p));
   }
 
-  _readValue(InputBuffer p) {
+  int _readValue(InputBuffer p) {
     switch (type) {
       case TYPE_BYTE:
       case TYPE_ASCII:
@@ -58,7 +58,7 @@ class TiffEntry {
         if (den == 0) {
           return 0;
         }
-        return num / den;
+        return num ~/ den;
       case TYPE_SBYTE:
         throw new ImageException('Unhandled value type: SBYTE');
       case TYPE_UNDEFINED: