Skip to content

Commit e3e6b4d

Browse files
committed
Fixes warnings.
1 parent 68a6c34 commit e3e6b4d

File tree

2 files changed

+1
-25
lines changed

2 files changed

+1
-25
lines changed

src/core/codestream/ojph_params.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,6 @@ namespace ojph {
958958
{
959959
assert(type == COD_MAIN);
960960

961-
this->type = type;
962961
if (file->read(&Lcod, 2) != 2)
963962
OJPH_ERROR(0x00050071, "error reading COD segment");
964963
Lcod = swap_byte(Lcod);
@@ -997,7 +996,6 @@ namespace ojph {
997996
assert(type == COC_MAIN);
998997
assert(top_cod != NULL);
999998

1000-
this->type = type;
1001999
this->SGCod = top_cod->SGCod;
10021000
this->top_cod = top_cod;
10031001
if (file->read(&Lcod, 2) != 2)
@@ -1091,7 +1089,7 @@ namespace ojph {
10911089
param_cod *p = this;
10921090
while (p->next != NULL)
10931091
p = p->next;
1094-
p->next = new param_cod(this, comp_idx);
1092+
p->next = new param_cod(this, (ui16)comp_idx);
10951093
return p->next;
10961094
}
10971095

src/core/transform/ojph_colour_sse2.cpp

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -82,28 +82,6 @@ namespace ojph {
8282
_MM_SET_ROUNDING_MODE(rounding_mode);
8383
}
8484

85-
//////////////////////////////////////////////////////////////////////////
86-
// _mm_max_epi32 requires SSE4.1, so here we implement it in SSE2
87-
static inline
88-
__m128i ojph_mm_max_epi32(__m128i a, __m128i b)
89-
{
90-
__m128i c = _mm_cmpgt_epi32(a, b); // 0xFFFFFFFF for a > b
91-
__m128i d = _mm_and_si128(c, a); // keep only a, where a > b
92-
__m128i e = _mm_andnot_si128(c, b); // keep only b, where a <= b
93-
return _mm_or_si128(d, e); // combine
94-
}
95-
96-
//////////////////////////////////////////////////////////////////////////
97-
// _mm_min_epi32 requires SSE4.1, so here we implement it in SSE2
98-
static inline
99-
__m128i ojph_mm_min_epi32 (__m128i a, __m128i b)
100-
{
101-
__m128i c = _mm_cmplt_epi32(a, b); // 0xFFFFFFFF for a < b
102-
__m128i d = _mm_and_si128(c, a); // keep only a, where a < b
103-
__m128i e = _mm_andnot_si128(c, b); // keep only b, where a >= b
104-
return _mm_or_si128(d, e); // combine
105-
}
106-
10785
//////////////////////////////////////////////////////////////////////////
10886
static inline
10987
__m128i ojph_mm_max_ge_epi32(__m128i a, __m128i b, __m128 x, __m128 y)

0 commit comments

Comments
 (0)