summaryrefslogtreecommitdiff
path: root/avstream/avscamera/sys/RGB24Synthesizer.cpp
diff options
context:
space:
mode:
authorWei Mao <[email protected]>2017-03-20 18:25:57 -0700
committerWei Mao <[email protected]>2017-03-20 18:27:00 -0700
commite044ea456aad4c444fbce00a2d9b56b304d59884 (patch)
tree4326af385f0666a3af0b7dfae534db68e3e25785 /avstream/avscamera/sys/RGB24Synthesizer.cpp
parentbc6e698503f46afbd8fcf62f6d3939147dc49999 (diff)
parente4581d8cd1bcc5108786b082a1ec24007a508847 (diff)
Merge pull request #118 from saredd/master
Diffstat (limited to 'avstream/avscamera/sys/RGB24Synthesizer.cpp')
-rw-r--r--avstream/avscamera/sys/RGB24Synthesizer.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/avstream/avscamera/sys/RGB24Synthesizer.cpp b/avstream/avscamera/sys/RGB24Synthesizer.cpp
index 21c6e054..89c648bd 100644
--- a/avstream/avscamera/sys/RGB24Synthesizer.cpp
+++ b/avstream/avscamera/sys/RGB24Synthesizer.cpp
@@ -35,10 +35,6 @@
#pragma code_seg()
#endif // ALLOC_PRAGMA
-// suppressed due to Esp:773
-#pragma warning (push)
-#pragma warning( disable:26015 ) // Suppress OACR error. Seems nonsensical. TODO: Must revisit.
-#pragma warning( disable:26019 )
_Success_(return > 0)
ULONG
CRGB24Synthesizer::
@@ -110,6 +106,7 @@ Return Value:
DWORD P2 = pSrc[2];
DWORD P3 = pSrc[3];
((PDWORD) pDst)[0] = ((P0 ) & 0x00FFFFFF) | (P1 << 24);
+#pragma warning(suppress: 6386) // TODO: Add OACR bug number once known
((PDWORD) pDst)[1] = ((P1 >> 8) & 0x0000FFFF) | (P2 << 16);
((PDWORD) pDst)[2] = ((P2 >> 16) & 0x000000FF) | (P3 << 8);
pDst += 4 * 3;
@@ -129,5 +126,3 @@ Return Value:
return limit * Stride;
}
-// suppressed due to Esp:773
-#pragma warning (pop)