diff options
| author | Brad Davis <[email protected]> | 2014-05-23 01:49:32 -0700 |
|---|---|---|
| committer | Brad Davis <[email protected]> | 2014-05-23 01:49:32 -0700 |
| commit | 46acc0e194ff3c1f120199eeca8324b4502118e9 (patch) | |
| tree | b1030198d3ee4698445d1fc5161cebe4158e45d1 /LibOVR/Src/OVR_Profile.cpp | |
| parent | 07d0f4d0bbf3477ac6a9584f726e8ec6ab285707 (diff) | |
Updating to 0.3.2 (windows version)
Diffstat (limited to 'LibOVR/Src/OVR_Profile.cpp')
| -rw-r--r-- | LibOVR/Src/OVR_Profile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/LibOVR/Src/OVR_Profile.cpp b/LibOVR/Src/OVR_Profile.cpp index 1fa8eb4..4844c29 100644 --- a/LibOVR/Src/OVR_Profile.cpp +++ b/LibOVR/Src/OVR_Profile.cpp @@ -161,7 +161,7 @@ bool ProfileManager::GetDeviceTags(const DeviceBase* device, String& product, St // If the HMD is unrecognized then use the name stamped into the // sensor firmware - if (hmdinfo.HmdType == HmdType_None || hmdinfo.Type == HmdType_Unknown) + if (hmdinfo.HmdType == HmdType_None || hmdinfo.HmdType == HmdType_Unknown) product_name = sinfo.ProductName.ToCStr(); else product_name = hmdinfo.ProductName.ToCStr(); @@ -758,7 +758,7 @@ Profile* ProfileManager::GetTaggedProfile(const char** tag_names, const char** t JSON* tagged_data = ProfileCache->GetItemByName("TaggedData"); OVR_ASSERT(tagged_data); if (tagged_data == NULL) - return false; + return NULL; Profile* profile = new Profile(); @@ -1450,7 +1450,7 @@ void Profile::SetFloatValues(const char* key, const float* vals, int num_vals) ValMap.Set(key, value); } - for (val_count; val_count < num_vals; val_count++) + for (; val_count < num_vals; val_count++) value->AddArrayNumber(vals[val_count]); } @@ -1510,7 +1510,7 @@ void Profile::SetDoubleValues(const char* key, const double* vals, int num_vals) ValMap.Set(key, value); } - for (val_count; val_count < num_vals; val_count++) + for (; val_count < num_vals; val_count++) value->AddArrayNumber(vals[val_count]); } |