Merge pull request #604 from tdaede/density_fix_2

Force density setting for D88/NFD.

Author: davidgiven

lib/imagereader/d88imagereader.cc

@@ -65,19 +65,15 @@ class D88ImageReader : public ImageReader
         int clockRate = 500;
         if (mediaFlag == 0x20)
         {
-            Logger() << "D88: high density mode";
-			if (!config.drive().has_drive())
+            Logger() << "D88: forcing high density mode";
 				config.mutable_drive()->set_high_density(true);
-            if (!config.has_tpi())
                 config.set_tpi(96);
         }
         else
         {
-            Logger() << "D88: single/double density mode";
+            Logger() << "D88: forcing single/double density mode";
             clockRate = 300;
-			if (!config.drive().has_drive())
 				config.mutable_drive()->set_high_density(false);
-            if (!config.has_tpi())
                 config.set_tpi(48);
         }
 

lib/imagereader/nfdimagereader.cc

@@ -57,8 +57,9 @@ class NFDImageReader : public ImageReader
         auto ibm = config.mutable_encoder()->mutable_ibm();
 		auto layout = config.mutable_layout();
         Logger() << "NFD: HD 1.2MB mode";
-        if (!config.drive().has_drive())
-            config.mutable_drive()->set_high_density(true);
+        Logger() << "NFD: forcing hign density mode";
+        config.mutable_drive()->set_high_density(true);
+        config.set_tpi(96);
 
         std::unique_ptr<Image> image(new Image);
         for (int track = 0; track < 163; track++)