diff options
author | 2016-03-09 14:18:40 -0800 | |
---|---|---|
committer | 2016-03-09 15:48:10 -0800 | |
commit | 11f4d83b064fd53b0d4063b3c40212e11710b051 (patch) | |
tree | 95b48a8f016713092e582dfaebb357b0508be7b9 /tensorflow/core/kernels/decode_raw_op.cc | |
parent | 0c4be88cc8723e3f07bb8e4b5b918ec1ad1638b2 (diff) |
DecodeRaw should use int64 for sizes, not int
Change: 116802454
Diffstat (limited to 'tensorflow/core/kernels/decode_raw_op.cc')
-rw-r--r-- | tensorflow/core/kernels/decode_raw_op.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tensorflow/core/kernels/decode_raw_op.cc b/tensorflow/core/kernels/decode_raw_op.cc index 42674be967..172bb95661 100644 --- a/tensorflow/core/kernels/decode_raw_op.cc +++ b/tensorflow/core/kernels/decode_raw_op.cc @@ -35,9 +35,9 @@ class DecodeRawOp : public OpKernel { void Compute(OpKernelContext* context) override { const auto& input = context->input(0); - int str_size = -1; + int64 str_size = -1; auto flat_in = input.flat<string>(); - for (int i = 0; i < flat_in.size(); ++i) { + for (int64 i = 0; i < flat_in.size(); ++i) { const string& in_str = flat_in(i); if (str_size == -1) { str_size = in_str.size(); @@ -62,7 +62,7 @@ class DecodeRawOp : public OpKernel { errors::InvalidArgument("Input to DecodeRaw has length ", str_size, " that is not a multiple of ", sizeof(T), ", the size of ", DataTypeString(out_type_))); - const int added_dim = str_size / sizeof(T); + const int64 added_dim = str_size / sizeof(T); out_shape.AddDim(added_dim); Tensor* output_tensor = nullptr; OP_REQUIRES_OK( @@ -76,7 +76,7 @@ class DecodeRawOp : public OpKernel { little_endian_ ? "true" : "false")); // Endianness matches, so just copy each string byte-for-byte. T* out_data = out.data(); - for (int i = 0; i < flat_in.size(); ++i) { + for (int64 i = 0; i < flat_in.size(); ++i) { const T* in_data = reinterpret_cast<const T*>(flat_in(i).data()); memcpy(out_data, in_data, str_size); out_data += added_dim; |