Merge remote-tracking branch 'origin/3.0' into feature/qnode5
This commit is contained in:
commit
4e549b6404
|
@ -308,8 +308,8 @@ static FORCE_INLINE int32_t tdSetBitmapValTypeII(void *pBitmap, int16_t colIdx,
|
||||||
// use literal value directly and not use formula to simplify the codes
|
// use literal value directly and not use formula to simplify the codes
|
||||||
switch (nOffset) {
|
switch (nOffset) {
|
||||||
case 0:
|
case 0:
|
||||||
*pDestByte = ((*pDestByte) & 0x3F) | (valType << 6);
|
|
||||||
// set the value and clear other partitions for offset 0
|
// set the value and clear other partitions for offset 0
|
||||||
|
*pDestByte = (valType << 6);
|
||||||
// *pDestByte |= (valType << 6);
|
// *pDestByte |= (valType << 6);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
|
@ -417,8 +417,8 @@ static FORCE_INLINE int32_t tdSetBitmapValTypeI(void *pBitmap, int16_t colIdx, T
|
||||||
// use literal value directly and not use formula to simplify the codes
|
// use literal value directly and not use formula to simplify the codes
|
||||||
switch (nOffset) {
|
switch (nOffset) {
|
||||||
case 0:
|
case 0:
|
||||||
*pDestByte = ((*pDestByte) & 0x7F) | (valType << 7);
|
|
||||||
// set the value and clear other partitions for offset 0
|
// set the value and clear other partitions for offset 0
|
||||||
|
*pDestByte = (valType << 7);
|
||||||
// *pDestByte |= (valType << 7);
|
// *pDestByte |= (valType << 7);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
|
|
Loading…
Reference in New Issue