Commit 8b7e0eef authored by Kristin Berry's avatar Kristin Berry
Browse files

Fix hopefully last merge problem

parent 03d69ca0

tests/Fixtures.h

+2 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ class FrameStateTest : public ::testing::Test { 
  protected:

    csm::Isd isd;    

    UsgsAstroFrameSensorModel* createModifiedStateSensorModel(std::string key, double newValue) {

      UsgsAstroFramePlugin frameCameraPlugin;

      csm::Model *model = frameCameraPlugin.constructModelFromISD(isd,"USGS_ASTRO_FRAME_SENSOR_MODEL");

      UsgsAstroPlugin cameraPlugin;

      csm::Model *model = cameraPlugin.constructModelFromISD(isd,"USGS_ASTRO_FRAME_SENSOR_MODEL");



      UsgsAstroFrameSensorModel* sensorModel = dynamic_cast<UsgsAstroFrameSensorModel *>(model);

      if (sensorModel) {